revised manual reference pages and images RCL_2_4
authorfturovic <frank.turovich@nokia.com>
Fri, 12 Feb 2010 14:45:16 -0600
branchRCL_2_4
changeset 949 57698352558c
parent 944 248e161fd5cd
child 950 6773165abc05
revised manual reference pages and images
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/images/SDKPreferences.png
core/com.nokia.carbide.cpp.doc.user/html/images/views/view_memory.png
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html
core/com.nokia.carbide.cpp.doc.user/html/reference/ROM_build_settings.html
core/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html
core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_mem_rendering_options.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_expressions.png
core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_debug_overview.png
core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_global_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/view_system_browser.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm
core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_expressions.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,36 +1,36 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Adding and Removing Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding and Removing Expressions</h2>
-<p>An <i>expression</i> is a snippet of code that is evaluated to produce a value. In Carbide they are defined using C/C++ expressions. Some expressions may need to be evaluated at a specific location in the program so that its variables can be referenced. Adding more expressions  to the <a href="viewing_expressions.htm">Expressions</a> view list can slow down the automatic display as each must be evaluated to update its value. To manage large lists of expressions, use the <b>Enable</b> and <b>Disable</b> options in the context menu to control which expressions are automatically evaluated.</p>
-<p>You  add  expressions in the <b>Add Watch Expression</b> dialog  using a variety of views, including <a href="../../reference/view_expressions.htm">Expressions</a>, <a href="../../reference/view_variables.htm">Variables</a>, and editor views. Right-click in the view and select the <b>Add Watch Expression...</b> command from the context menu.</p>
-<p align="center"><img src="../images/wnd_add_watch_expr.png"></p>
-<p class="figure">Figure 1. Add Watch Expression dialog</p>
-<p>You can enter any valid C/C++ expression, for example:</p>
-<blockquote>
-  <p class="code">2 + 2<br>
-    myVariable + 8<br>
-    &amp;myVariable<br>
-    myClass.myMemberVar<br>
-    etc.</p>
-</blockquote>
-<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
-<blockquote>
-  <p class="code">std:strlen(&quot;Hello&quot;); </p>
-</blockquote>
-<h4>Removing Expressions</h4>
-<p>Right-click the expression in the Expressions view and select the <b>Remove</b> menu option. This removes the selected expression from the Expression list.</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Adding and Removing Expressions</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Adding and Removing Expressions</h2>
+<p>An <i>expression</i> is a snippet of code that is evaluated to produce a value. In Carbide they are defined using C/C++ expressions. Some expressions may need to be evaluated at a specific location in the program so that its variables can be referenced. Adding more expressions  to the <a href="viewing_expressions.htm">Expressions</a> view list can slow down the automatic display as each must be evaluated to update its value. To manage large lists of expressions, use the <b>Enable</b> and <b>Disable</b> options in the context menu to control which expressions are automatically evaluated.</p>
+<p>You  add  expressions in the <b>Add Watch Expression</b> dialog  using a variety of views, including <a href="../../reference/view_expressions.htm">Expressions</a>, <a href="../../reference/view_variables.htm">Variables</a>, and editor views. Right-click in the view and select the <b>Add Watch Expression...</b> command from the context menu.</p>
+<p align="center"><img src="../images/wnd_add_watch_expr.png"></p>
+<p class="figure">Figure 1. Add Watch Expression dialog</p>
+<p>You can enter any valid C/C++ expression, for example:</p>
+<blockquote>
+  <p class="code">2 + 2<br>
+    myVariable + 8<br>
+    &amp;myVariable<br>
+    myClass.myMemberVar<br>
+    etc.</p>
+</blockquote>
+<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
+<blockquote>
+  <p class="code">std:strlen(&quot;Hello&quot;); </p>
+</blockquote>
+<h4>Removing Expressions</h4>
+<p>Right-click the expression in the Expressions view and select the <b>Remove</b> menu option. This removes the selected expression from the Expression list.</p>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/editing_expressions.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,22 +1,35 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Editing Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Editing Expressions </h2>
-<p>Use the <b>Edit Watch Expression</b> dialog to change a previously defined expression. Right-click in the <a href="viewing_expressions.htm">Expressions</a> view and select the <b>Edit Watch Expression...</b> command from the context menu. When editing an expression, the same rules used to create it apply. Mainly, the edited expression must be a valid C/C++ expression that evaluates to a value and does not call a function nor execute code.</p>
-<p>Use the <b>Enable</b> control to set whether this expression should be automatically evaluated during a debug session.</p>
-<p align="center"><img src="../images/wnd_edit_watch_expr.png"></p>
-<p class="figure">Figure 1. Edit Watch Expression dialog</p>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Editing Expressions</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Editing Expressions </h2>
+<p>Use the <b>Edit Watch Expression</b> dialog to change a previously defined expression. Right-click in the <a href="viewing_expressions.htm">Expressions</a> view and select the <b>Edit Watch Expression...</b> command from the context menu. When editing an expression, the same rules used to create it apply. Mainly, the edited expression must be a valid C/C++ expression that evaluates to a value and does not call a function nor execute code.</p>
+<p>Use the <b>Enable</b> control to set whether this expression should be automatically evaluated during a debug session.</p>
+<p align="center"><img src="../images/wnd_edit_watch_expr.png"></p>
+<p class="figure">Figure 1. Edit Watch Expression dialog</p>
+<p>You can enter any valid C/C++ expression, for example:</p>
+<blockquote>
+  <p class="code">2 + 2<br>
+    myVariable + 8<br>
+    &amp;myVariable<br>
+    myClass.myMemberVar<br>
+    etc.</p>
+</blockquote>
+<p>are all valid expressions that the Expressions view can monitor and display. However, an expression cannot call a function or execute code. The following example will not work:</p>
+<blockquote>
+  <p class="code">std:strlen(&quot;Hello&quot;); </p>
+</blockquote>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>
+License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/SDKPreferences.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/images/views/view_memory.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectPreferences.html	Fri Feb 12 14:45:16 2010 -0600
@@ -21,6 +21,8 @@
   <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>
    </ul>
+<p align="center"><img src="images/carbide_build_config.png" width="795" height="692"></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
 		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>file_name</i>&gt;</b> window  shows  the settings that are
@@ -30,7 +32,7 @@
 	   <ul>
 	     <li><a href="../tasks/projects/prj_build.htm">Building Projects</a></li>
    </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ProjectTypeandSDK.html	Fri Feb 12 14:45:16 2010 -0600
@@ -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="SDKPreferences.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="../images/step4.png" width="500" height="567"><br>
 </p>
 </div>
 
@@ -55,7 +55,7 @@
 <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
 <li><a href="SDKPreferences.html">SDK Preferences</a></li>
   </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/ROM_build_settings.html	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/ROM_build_settings.html	Fri Feb 12 14:45:16 2010 -0600
@@ -1,42 +1,42 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
-<title>ROM Builder pane</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-<meta name="keywords" content="ROM Builder" >
-</head>
-   <body>
-   <h2>ROM Builder pane </h2>
-   <p>Use the <b>ROM Builder</b> pane to specify commands and a working directory for building a GUI ROM Image. The tool used to build GUI ROM images is called buildrom and can typically be found in your SDK path, for example in the <span class="code">\Symbian\9.1\S60_3rd\Epoc32\tools</span> directory. The tool used to build text shell images is called ROM. The ROM image generated from the ROM building process specifies a base address for the image to run at. This might be an address in RAM or ROM. The image must be downloaded to the device at this address.</p>
-   <p>Building a ROM requires that the following are available, or have been successfully created:</p>
-   <ul>
-     <li> Symbian OS components making up a set of releasables</li>
-     <li> a Bootstrap binary image</li>
-     <li> a text file specifying how the ROM image is to be built.</li>
-   </ul>
-   <p>Rom build assembles executable and data files into a ROM image.</p>
-   <p>Executables are pre-processed, relocated, and have their imports and exports bound for a ROM image based at some given virtual address. The files, base address of the ROM, and various other parameters are specified by means of the obey file. This is a file of type .oby and is a text file containing statements that specify how the ROM image is to be built. A .oby file can include other files in the same way that files containing C++ source can #include other C++ files. By convention, the included files have the .iby file type. This structure allows flexibility in the way that ROM images are defined.</p>
-   <p class="note"><b>NOTE</b> The ROM image will be rebuilt for any target whenever a change to the project occurs; except for WINSCW targets.</p>
-   <p align="center"><img src="images/rom_build.png" width="558" height="203" /></p>
-   <p align="center" class="figure">Figure 1. ROM Builder pane </p>
-   <h5>Table 1. ROM Build Settings &mdash;items</h5>
-   <table cellpadding="2" cellspacing="0"
-border="0">
-	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
-         <tr valign="top">
-           <td class="Cell"><b>ROM Build Command Line</b></td>
-           <td class="Cell"><p>Enter commands to build the GUI ROM Image. For example, the following sample command  is used for building a techview
-             rom image for a H4 reference board.</p>
-             <p class="code">buildrom -D_FULL_DEBUG -DRVCT -DSTOP_MODE_DEBUGGING -D_EABI=ARMV5 h4hrp techview -oh4.img</p></td>
-        </tr>
-         <tr valign="top">
-           <td class="Cell"><b>Working Directory</b></td>
-           <td class="Cell"><p>Specify the working directory for building the ROM Image. Typically, the working directory is the folder where you need to have your rom image built.
-Note that your sdk and working directory should be on
-the same drive, otherwise some of the rombuild scripts will fail.</p>
-           </td>
-     </tr>
-   </table>
-	 <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-   </html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"><html><head>
+<title>ROM Builder pane</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<meta name="keywords" content="ROM Builder" >
+</head>
+   <body>
+   <h2>ROM Builder pane </h2>
+   <p>Use the <b>ROM Builder</b> pane to specify commands and a working directory for building a GUI ROM Image. The tool used to build GUI ROM images is called buildrom and can typically be found in your SDK path, for example in the <span class="code">\Symbian\9.1\S60_3rd\Epoc32\tools</span> directory. The tool used to build text shell images is called ROM. The ROM image generated from the ROM building process specifies a base address for the image to run at. This might be an address in RAM or ROM. The image must be downloaded to the device at this address.</p>
+   <p>Building a ROM requires that the following are available, or have been successfully created:</p>
+   <ul>
+     <li> Symbian OS components making up a set of releasables</li>
+     <li> a Bootstrap binary image</li>
+     <li> a text file specifying how the ROM image is to be built.</li>
+   </ul>
+   <p>Rom build assembles executable and data files into a ROM image.</p>
+   <p>Executables are pre-processed, relocated, and have their imports and exports bound for a ROM image based at some given virtual address. The files, base address of the ROM, and various other parameters are specified by means of the obey file. This is a file of type .oby and is a text file containing statements that specify how the ROM image is to be built. A .oby file can include other files in the same way that files containing C++ source can #include other C++ files. By convention, the included files have the .iby file type. This structure allows flexibility in the way that ROM images are defined.</p>
+   <p class="note"><b>NOTE</b> The ROM image will be rebuilt for any target whenever a change to the project occurs; except for WINSCW targets.</p>
+   <p align="center"><img src="images/rom_build.png" width="558" height="203" /></p>
+   <p align="center" class="figure">Figure 1. ROM Builder pane </p>
+   <h5>Table 1. ROM Build Settings &mdash;items</h5>
+   <table cellpadding="2" cellspacing="0"
+border="0">
+	 <tr valign="top"><th width="221" class="Cell">Name</th><th width="558" class="Cell">Function</th></tr>
+         <tr valign="top">
+           <td class="Cell"><b>ROM Build Command Line</b></td>
+           <td class="Cell"><p>Enter commands to build the GUI ROM Image. For example, the following sample command  is used for building a techview
+             rom image for a H4 reference board.</p>
+             <p class="code">buildrom -D_FULL_DEBUG -DRVCT -DSTOP_MODE_DEBUGGING -D_EABI=ARMV5 h4hrp techview -oh4.img</p></td>
+        </tr>
+         <tr valign="top">
+           <td class="Cell"><b>Working Directory</b></td>
+           <td class="Cell"><p>Specify the working directory for building the ROM Image. Typically, the working directory is the folder where you need to have your rom image built.
+Note that your sdk and working directory should be on
+the same drive, otherwise some of the rombuild scripts will fail.</p>
+           </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/SDKPreferences.html	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/SDKPreferences.html	Fri Feb 12 14:45:16 2010 -0600
@@ -24,8 +24,8 @@
    <p class="note"><b>NOTE</b> This panel serves as a <span class="code">devices.xml</span> file editor. The <span class="code">devices.xml</span> file stores information about the installed SDKs used for Symbian OS development.</p>
    <div class="Figure">
 
-	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="696" height="583" alt="SDK preferences panel" /></p>
-	  <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
+	  <p align="center" class="Image"><img src="../images/SDKPreferences.png" width="740" height="546" alt="SDK preferences panel" /></p>
+     <p align="center" class="figure">Figure 1. SDK Preferences preference panel </p>
    </div>
    <table cellpadding="2" cellspacing="0"
 border="0">
@@ -38,14 +38,14 @@
            <p>Click on a SDK name to see its EPOCROOT location and build configuration status in the SDK Information area. </p></td>
         </tr>
          <tr valign="top">
+           <td class="Cell"><b>Remove SDK </b></td>
+           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
+         </tr>
+         <tr valign="top">
            <td class="Cell"><b>Add New SDK </b></td>
            <td class="Cell"><p>Click to <a href="../tasks/sdks/sdk_add.htm">add</a> an SDK to the <b>Available Symbian OS SDKs</b> list.</p>           </td>
      </tr>
          <tr valign="top">
-           <td class="Cell"><b>Remove SDK </b></td>
-           <td class="Cell">Click to remove the selected SDK from the Available Symbian OS SDK's list. </td>
-        </tr>
-         <tr valign="top">
            <td class="Cell"><b>SDK Properties</b></td>
            <td class="Cell"><p>Click to view and edit the <a href="../tasks/sdks/sdk_view_properties.htm">properties</a> of the currently selected SDK in the <b>Available Symbian OS SDKs</b> list.</p>           </td>
      </tr>
@@ -59,16 +59,14 @@
              <p class="note"><b>NOTE</b> Carbide.c++ scans for available SDKs each time it is started.</p></td>
         </tr>
    </table>
-	 <h3>Legacy SDK's </h3>
-	 <p>For legacy SDK's the OS/SDK version is determined from the SDK id. Some older SDK's have two verisons, one where the emulator was built with MSVC and the other built with CodeWarrior. We support those SDK's built with CodeWarrior. The id of that SDK is <span class="code">S60_2nd_FP2_CW</span>.</p>
-	 <h5>Related tasks</h5>
+   <h5>Related tasks</h5>
 	 <ul>
        
        <li><a href="../tasks/WorkingwithSDKs.html">Working with SDKs</a></li>
        <li><a href="../tasks/AddinganSDK.html">Adding an SDK</a></li>
        <li><a href="../tasks/RmvngandVwngPropsosSDK.html">SDK Properties</a></li>
   </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
    </body>
    </html>
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/menu_mem_rendering_options.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/view_expressions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/reference/images/wnd_debug_overview.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/reference.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,21 +1,21 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Reference</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Reference</h2>
-<p>  This section provides reference information on the Carbide IDE including:</p>
-<ul>
-  <li><a href="debugger_settings.htm">Debugger settings</a> &mdash; shows the Carbide debugger setting panels used to control debug sessions </li>
-  <li><a href="view_expressions.htm">Expression views</a> &mdash; shows how to work with expressions in a debugging session</li>
-  <li><a href="view_variables.htm">Variable views</a> &mdash; shows how to work with variables in a debugging session</li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Reference</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Reference</h2>
+<p>  This section provides reference information on the Carbide IDE including:</p>
+<ul>
+  <li><a href="debugger_settings.htm">Debugger settings</a> &mdash; shows the Carbide debugger setting panels used to control debug sessions </li>
+  <li><a href="view_expressions.htm">Expression views</a> &mdash; shows how to work with expressions in a debugging session</li>
+  <li><a href="view_variables.htm">Variable views</a> &mdash; shows how to work with variables in a debugging session</li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -9,19 +9,19 @@
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Expressions View </h2>
-<p>  The <b>Expressions</b> view helps you monitor and manipulate these  items:</p>
+<p>  Use the <b>Expressions</b> view to monitor and manipulate:</p>
 <ul>
   <li>global and local variables</li>
   <li>structure members</li>
   <li>array elements</li>
 </ul>
-<p>The Expressions view displays these columns: </p>
+<p>The Expressions view displays these panes: </p>
 <ul>
-  <li>Expression column&#8212;Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression view.</li>
-  <li>Value column&#8212;Shows the current value of each corresponding expression. Double-click a value to change it.</li>
+  <li>Expression pane (left) &#8212; Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression view.</li>
+  <li>Value pane (right) &#8212; Shows the current value of each corresponding expression. Double-click a value to change it.</li>
 </ul>
-<p>Figure 1 shows the Expressions view. Table 1 explains items in view.</p>
-<p align="center"><img src="images/view_expressions.png" width="439" height="144" /></p>
+<p>Figure 1 shows the <b>Expressions</b> view.</p>
+<p align="center"><img src="images/view_expressions.png" width="571" height="202" /></p>
 <p class="figure">Figure 1 - Expressions view </p>
 <h5>Table 1. Expressions view &mdash;items </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
@@ -46,6 +46,11 @@
       <td>Collapses all expanded expressions into the top level. </td>
     </tr>
     <tr>
+      <td><b>New Watch Expression</b></td>
+      <td>&nbsp;</td>
+      <td>Click to open the <b>Add Watch Expression</b> dialog.</td>
+    </tr>
+    <tr>
       <td><b>Remove Selected Expression </b></td>
       <td><div align="center"><img src="../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
       <td>Click to remove all currently selected expressions from the expressions list. </td>
@@ -55,15 +60,20 @@
       <td><div align="center"><img src="../images/icons/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
       <td>Click to remove all expressions from the expressions list. </td>
     </tr>
+    <tr>
+      <td><b>Refresh</b></td>
+      <td>&nbsp;</td>
+      <td>Click to refresh view display.</td>
+    </tr>
 </table>
-  <h4>Opening the Expressions View </h4>
+<h4>Opening the Expressions View </h4>
   <p>Use the Expressions view to inspect frequently used variables as their values change during a debugging session.</p>
   <div class="step">
   <h4>Opening an Expressions view </h4>
   <ul>
     <li>Select Window &gt; Show View &gt; Expressions</li>
     <li>OR</li>
-    <li>Right-click a variable in the <a href="view_variables.htm">Variables</a> or editor view and choose the Add Watchpoint command </li>
+    <li>Right-click a variable in the <a href="view_variables.htm">Variables</a> or editor view and choose the Add Watchpoint (C/C++) menu item</li>
     <p>An Expressions view appears in the current perspective.</p>
   </ul>
 </div>
@@ -72,7 +82,7 @@
   <li><a href="../debugger/variables/adding_expressions.htm">Adding &amp; Removing Expressions</a></li>
   <li><a href="../debugger/variables/editing_expressions.htm">Editing Expressions</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_global_variables.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_global_variables.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,53 +1,53 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Global Variables Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Global Variables Window</h2>
-<p>The Global Variables window shows all global and static variables for each process that you debug. You can open separate Global Variables windows for each process in the same build target. Use the window to observe changes in variable values as the program executes.</p>
-<p>Figure 1  shows the Global Variables window. Table 1  explains the items in the window.</p>
-<p class="figure">Figure 1 Global Variables window</p>
-<h5>Table 1 Global Variables window&mdash;items </h5>
-<table width="84%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="28%" scope="col">Item</th>
-    <th width="72%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>File</td>
-    <td>Lists source files that declare global or static variables. Click a source file to view its static variables. Click Global Variables to view all global variables declared in the program.</td>
-  </tr>
-  <tr>
-    <td>Variables</td>
-    <td>Lists variables according to the file selected in the File pane. Double-click a variable to display it in a separate Variable window.</td>
-  </tr>
-</table>
-<div class="step">
-  <h5>Opening the Global Variables Window</h5>
-  <p>Use the Global Variables window to display global variables declared in a program or static variables declared in source files that comprise the program.</p>
-  <ul>
-    <li>To open the Global Variables window, select View &gt; Global Variables or Window &gt; Global Variables Window.</li>
-  </ul>
-</div>
-<p></p>
-<div class="step">
-  <h5>Viewing Global Variables for Different Processes</h5>
-  <p>You can open a separate Global Variables window for each process that the same parent application creates.</p>
-  <p>To open the Global Variables window for a particular process, follow these steps:</p>
-  <ol>
-    <li>Click Project &gt; Debug.</li>
-  <p>A debugging session starts.</p>
-    <li>In the Thread window toolbar, use the Process list box to specify the process that has the global variables that you want to examine.</li>
-    <li>Click View &gt; Global Variables or Window &gt; Global Variables Window.</li>
-    <p>Repeat these steps for each process that has global variables that you want to examine.</p>
-  </ol>
-</div>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</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>Global Variables Window</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Global Variables Window</h2>
+<p>The Global Variables window shows all global and static variables for each process that you debug. You can open separate Global Variables windows for each process in the same build target. Use the window to observe changes in variable values as the program executes.</p>
+<p>Figure 1  shows the Global Variables window.</p>
+<p class="figure">Figure 1 Global Variables window</p>
+<h5>Table 1 Global Variables window&mdash;items </h5>
+<table width="84%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="28%" scope="col">Item</th>
+    <th width="72%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>File</b></td>
+    <td>Lists source files that declare global or static variables. Click a source file to view its static variables. Click Global Variables to view all global variables declared in the program.</td>
+  </tr>
+  <tr>
+    <td><b>Variables</b></td>
+    <td>Lists variables according to the file selected in the File pane. Double-click a variable to display it in a separate Variable window.</td>
+  </tr>
+</table>
+<div class="step">
+  <h5>Opening the Global Variables Window</h5>
+  <p>Use the Global Variables window to display global variables declared in a program or static variables declared in source files that comprise the program.</p>
+  <ul>
+    <li>To open the Global Variables window, select View &gt; Global Variables or Window &gt; Global Variables Window.</li>
+  </ul>
+</div>
+<p></p>
+<div class="step">
+  <h5>Viewing Global Variables for Different Processes</h5>
+  <p>You can open a separate Global Variables window for each process that the same parent application creates.</p>
+  <p>To open the Global Variables window for a particular process, follow these steps:</p>
+  <ol>
+    <li>Click Project &gt; Debug.</li>
+  <p>A debugging session starts.</p>
+    <li>In the Thread window toolbar, use the Process list box to specify the process that has the global variables that you want to examine.</li>
+    <li>Click View &gt; Global Variables or Window &gt; Global Variables Window.</li>
+    <p>Repeat these steps for each process that has global variables that you want to examine.</p>
+  </ol>
+</div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_memory_wnd.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,88 +1,93 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Memory View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Memory View </h2>
-<p>  Use the <b>Memory</b> view to inspect and change process memory. You can address memory using expressions such as:</p>
-<ul>
-  <li class="code">0x0847d3c </li>
-  <li class="code">(&amp;y)+1024 </li>
-  <li class="code">*ptr</li>
-  <li class="code">FNname + 1 </li>
-</ul>
-<p>You can configure your output to display traditional, hexadecimal, ascii and/or signed/unsigned decimal. You can also set the size of the rendering columns. </p>
-<p class="note"><b>CAUTION</b> Arbitrarily changing memory contents could degrade the stability of the IDE, another program, or the operating system itself. Understand the consequences of manipulating memory.</p>
-<p>Figure 1 shows the Memory view. Table 1  explains the items in the view.</p>
-<p align="center"><img src="../images/views/view_memory.png" width="826" height="235" /></p>
-<p class="figure">Figure 2 - Memory view showing a memory rendering in traditional format</p>
-<h5>Table 1 Memory view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="37%" scope="col">Item</th>
-    <th width="11%" scope="col">Icon</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><a href="../tasks/memory/view_memory_show.htm">New Memory View</a> </td>
-    <td><div align="center"><img src="images/view_mem_new_memory_btn.png" width="16" height="17" /></div></td>
-    <td>Click to add a new Memory monitor view. </td>
-  </tr>
-  <tr>
-    <td><b>Pin Memory Monitor </b></td>
-    <td><div align="center"><img src="images/view_mem_pin_memory_btn.png" width="19" height="18" /></div></td>
-    <td>Pin memory view.</td>
-  </tr>
-  <tr>
-    <td><b>Toggle Memory Monitors Pane </b></td>
-    <td><div align="center"><img src="images/view_mem_toggle_pane_btn.png" width="19" height="17" /></div></td>
-    <td>Toggles the current Memory monitors view between showing only a Memory Monitor pane and a Memory Monitor and Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><b>Toggle Split Pane </b></td>
-    <td><div align="center"><img src="images/view_mem_split_pane_btn.png" width="17" height="17" /></div></td>
-    <td>Alternately shows and hides the Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><b>Link Memory Monitor Panes </b></td>
-    <td><div align="center"><img src="images/view_mem_link_btn.png" width="20" height="19" /></div></td>
-    <td><span>Enable to synchronize the current selection between the rendering of the same memory monitor </span>. </td>
-  </tr>
-  <tr>
-    <td><b>Switch Memory Monitor </b></td>
-    <td><div align="center"><img src="images/view_mem_switch_monitor_btn.png" width="33" height="20" /></div></td>
-    <td>If different memory monitor views have been added, select from list of memory monitor views.</td>
-  </tr>
-  <tr>
-    <td><a href="../tasks/memory/memory_monitor_adding.htm">Add Memory Monitor</a> / <a href="../tasks/memory/memory_rendering_adding.htm">Add Rendering</a> </td>
-    <td><div align="center"><img src="../images/icons/mem_add_monitor_icon.png" width="18" height="18" /></div></td>
-    <td>Add a new memory address or variable to the Memory Monitors pane, or add a new rendering to the Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><a href="../tasks/memory/memory_monitor_removing.htm">Remove Memory Monitor / Remove Rendering </a></td>
-    <td><div align="center"><img src="../images/icons/mem_remove_monitor_icon.png" width="19" height="19" /></div></td>
-    <td>Remove the selected   memory address or variable from the Memory Monitors pane, or remove the selected rendering from the Memory Rendering pane. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All </b></td>
-    <td><div align="center"><img src="../images/icons/mem_remove_all_icon.png" width="21" height="20" /></div></td>
-    <td>Remove all memory monitors or renderings from the associated pane. </td>
-  </tr>
-</table>
-<p align="left">Each memory monitor rendering pane can be configured independently. Right-click in the Renderings pane to see the rendering options available. The options presented in the context menu may differ if you have not chosen the Traditional rendering view (Figure 2). </p>
-<p align="center"><img src="images/menu_mem_rendering_options.png" width="446" height="340"></p>
-<p class="figure">Figure 2 - Rendering pane options </p>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/memory/memory_monitor_adding.htm"> Adding a Memory Monitor</a></li>
-  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding a Memory Rendering </a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Memory View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Memory View </h2>
+<p>  Use the <b>Memory</b> view to inspect and change process memory. You can address memory using expressions such as:</p>
+<ul>
+  <li class="code">0x0847d3c </li>
+  <li class="code">(&amp;y)+1024 </li>
+  <li class="code">*ptr</li>
+  <li class="code">FNname + 1 </li>
+</ul>
+<p>You can configure your output to display traditional, hexadecimal, ascii and/or signed/unsigned decimal. You can also set the size of the rendering columns. </p>
+<p class="note"><b>CAUTION</b> Arbitrarily changing memory contents could degrade the stability of the IDE, another program, or the operating system itself. Understand the consequences of manipulating memory.</p>
+<p>Figure 1 shows the Memory view.</p>
+<p align="center"><img src="../images/views/view_memory.png" width="639" height="250" /></p>
+<p class="figure">Figure 2 - Memory view showing a memory rendering in traditional format</p>
+<h5>Table 1 Memory view&mdash;items </h5>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="37%" scope="col">Item</th>
+    <th width="11%" scope="col">Icon</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><a href="../tasks/memory/view_memory_show.htm">New Memory View</a> </td>
+    <td><div align="center"><img src="images/view_mem_new_memory_btn.png" width="16" height="17" /></div></td>
+    <td>Click to add a new Memory monitor view. </td>
+  </tr>
+  <tr>
+    <td><b>Pin Memory Monitor </b></td>
+    <td><div align="center"><img src="images/view_mem_pin_memory_btn.png" width="19" height="18" /></div></td>
+    <td>Pin memory view.</td>
+  </tr>
+  <tr>
+    <td><b>Refresh</b></td>
+    <td>&nbsp;</td>
+    <td>Click to refresh the memory display.</td>
+  </tr>
+  <tr>
+    <td><b>Toggle Memory Monitors Pane </b></td>
+    <td><div align="center"><img src="images/view_mem_toggle_pane_btn.png" width="19" height="17" /></div></td>
+    <td>Toggles the current Memory monitors view between showing only a Memory Monitor pane and a Memory Monitor and Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><b>Toggle Split Pane </b></td>
+    <td><div align="center"><img src="images/view_mem_split_pane_btn.png" width="17" height="17" /></div></td>
+    <td>Alternately shows and hides the Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><b>Link Memory Monitor Panes </b></td>
+    <td><div align="center"><img src="images/view_mem_link_btn.png" width="20" height="19" /></div></td>
+    <td><span>Enable to synchronize the current selection between the rendering of the same memory monitor </span>. </td>
+  </tr>
+  <tr>
+    <td><b>Switch Memory Monitor </b></td>
+    <td><div align="center"><img src="images/view_mem_switch_monitor_btn.png" width="33" height="20" /></div></td>
+    <td>If different memory monitor views have been added, select from list of memory monitor views.</td>
+  </tr>
+  <tr>
+    <td><a href="../tasks/memory/memory_monitor_adding.htm">Add Memory Monitor</a> / <a href="../tasks/memory/memory_rendering_adding.htm">Add Rendering</a> </td>
+    <td><div align="center"><img src="../images/icons/mem_add_monitor_icon.png" width="18" height="18" /></div></td>
+    <td>Add a new memory address or variable to the Memory Monitors pane, or add a new rendering to the Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><a href="../tasks/memory/memory_monitor_removing.htm">Remove Memory Monitor / Remove Rendering </a></td>
+    <td><div align="center"><img src="../images/icons/mem_remove_monitor_icon.png" width="19" height="19" /></div></td>
+    <td>Remove the selected   memory address or variable from the Memory Monitors pane, or remove the selected rendering from the Memory Rendering pane. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All </b></td>
+    <td><div align="center"><img src="../images/icons/mem_remove_all_icon.png" width="21" height="20" /></div></td>
+    <td>Remove all memory monitors or renderings from the associated pane. </td>
+  </tr>
+</table>
+<p align="left">Each memory monitor rendering pane can be configured independently. Right-click in the Renderings pane to see the rendering options available. The options presented in the context menu may differ if you have not chosen the Traditional rendering view (Figure 2). </p>
+<p align="center"><img src="images/menu_mem_rendering_options.png" width="198" height="270"></p>
+<p class="figure">Figure 2 - Rendering pane options </p>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../tasks/memory/memory_monitor_adding.htm"> Adding a Memory Monitor</a></li>
+  <li><a href="../tasks/memory/memory_rendering_adding.htm">Adding a Memory Rendering </a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_mifdef_editor.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,108 +1,106 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
-<html><head>
-<title>MIF Editor</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-   <body>
-
-<h2>MBM/MIF Editor</h2>
-	  
-	 <p>The MIF Editor allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
-     included in  a S60 v3.0 and later GUI projects as well as standard <span class="code">.bmp</span> files. A .mif file is a MSX Interchange Format (MIF) file that should be built by the project. MIF files replace the functionality of AIF (and MBM) files.</p>
-	 <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0  and later SDKs.</p>
-	 <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to &quot;{EPOCROOT}\epoc32\include&quot; by default, so if an alternate location is required you can set this in the file properties.</p>
-	 <p>The MIF Editor appears when a MIF  file is
-	   opened for editing. To open the editor double-click on a .mif file in the Symbian Project Navigator view (figure 1), or select a scalable icon makefile (for example, Icons_scalable_dc.mk), right-click and select the Add MBM/MIF Entry command.</p>
-	 <p>&nbsp;</p>
-	 <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
-		<p class="figure">Figure 1 - MIF File in Symbian Project Navigator</p>
-		<p>&nbsp;</p>
-		<p><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
-		<p class="figure">Figure 2 - MBM/MIF Editor</p>
-		<h5>Table 1. MBM/MIF 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>Add From Project </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>Add From Filesystem </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>
-		<p>&nbsp;</p>
-   <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-   </body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html><head>
+<title>MIF Editor</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+   <body>
+
+<h2>MBM/MIF Editor</h2>
+	  
+	 <p>The <b>MIF Editor</b> allows you to create or edit the <span class="code">.mif</span> files list of scalable icons (<span class="code">.svg</span>)
+     included in  a S60 v3.0 and later GUI projects as well as standard <span class="code">.bmp</span> files. A .mif file is a MSX Interchange Format (MIF) file that should be built by the project. MIF files replace the functionality of AIF (and MBM) files.</p>
+   <p class="note"><b>NOTE</b> This editor is only supported by the S60 3.0  and later SDKs.</p>
+	 <p class="note"><b>NOTE</b> For resources that are included after creating a project, you should ensure that the output location is set correctly by viewing the file properties. The output location is set to &quot;<span class="code">{EPOCROOT}\epoc32\include</span>&quot; by default, so if an alternate location is required you can set this in the file properties.</p>
+   <p align="center" class="Image"><img src="../tasks/projects/images/mif_file_symprojnav.png" width="299" height="292"></p>
+		<p class="figure">Figure 1 - MIF File in the Symbian Project Navigator view</p>
+   <p>The <b>MIF Editor</b> appears when a MIF  file is
+   opened for editing. To open the editor double-click on a .mif file in the <a href="view_sym_proj_nav.htm">Symbian Project Navigator</a> view (figure 1), or select a scalable icon makefile (for example, <span class="code">Icons_scalable_dc.mk</span>), right-click and select the <b>Add MBM/MIF Entry</b> command.</p>
+   <p align="center"><img src="../tasks/projects/images/MBM_MIF_editor.png" width="900" height="600"> </p>
+   <p class="figure">Figure 2 - MBM/MIF Editor</p>
+		<h5>Table 1. MBM/MIF 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 <span class="code">EPOCROOT</span> 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>Add From Project </b></td>
+            <td>Click this button to open the <b>Add Images from Project</b> dialog to reference available images in the project.</td>
+          </tr>
+          <tr>
+            <td><b>Add From Filesystem </b></td>
+            <td>Click this button to open the <b>Add Images From Filesystem</b> 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 <b>Remove</b> 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>
+		<p>&nbsp;</p>
+   <div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+   </body>
+</html>
    
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_registers.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,63 +1,63 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Registers View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Registers View</h2>
-<p>  The <b>Registers</b> view reveals a hierarchical view of general, FPU, and host-specific registers of the host computer or target device. You can use the Register view to perform these tasks:</p>
-<ul>
-  <li>expand the hierarchical items in the window and <a href="../tasks/registers/mem_reg_viewing.htm">view</a> their contents</li>
-  <li>select and <a href="../tasks/registers/mem_reg_changing.htm">modify</a> register values</li>
-  <li><a href="../tasks/registers/mem_reg_data_views.htm">view</a> documentation for individual registers (depending on the register)</li>
-</ul>
-<p>Figure 1 shows a sample Registers view.</p>
-<p align="center"><img src="../concepts/images/ARM_registers.PNG" width="648" height="276" /></p>
-<p class="figure">Figure 1 - Registers View </p>
-<h5>Table 1. <span class="figure">Registers</span> view&mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="14%" scope="col">Icons</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Show Type Names </b></td>
-    <td><div align="center"><img src="../images/icons/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles the display of type names in the <span class="figure">Registers</span> view. </td>
-  </tr>
-  <tr>
-    <td><b>Show Logical Structure </b></td>
-    <td><div align="center"><img src="../images/icons/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
-    <td>Not available in C/C++ yet. </td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../images/icons/var_collapse_all_icon.png" width="17" height="18" /></div></td>
-    <td>Collapses all expanded variables into the top level. </td>
-  </tr>
-</table>
-<p align="left">For more information, see the <b>C/C++ Development User Guide &gt; Reference &gt; Debug View &gt; Registers view</b>. </p>
-<div class="step">
-  <h4>To open a Registers view </h4>
-  <ul>
-    <li>Click Window &gt; Show View &gt; Registers </li>
-    <p>A Registers view appears.</p>
-  </ul>
-</div>
-<h5>Other references </h5>
-<ul>
-  <li><a href="../concepts/registers.htm">Registers</a></li>
-  <li><a href="../concepts/arm_registers.htm">ARM Registers</a></li>
-  <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
-  <li><a href="../tasks/registers/mem_reg_viewing.htm">Viewing Register Values </a></li>
-  <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>Registers View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Registers View</h2>
+<p>  The <b>Registers</b> view reveals a hierarchical view of general, FPU, and host-specific registers of the host computer or target device. You can use the Register view to perform these tasks:</p>
+<ul>
+  <li>expand the hierarchical items in the window and <a href="../tasks/registers/mem_reg_viewing.htm">view</a> their contents</li>
+  <li>select and <a href="../tasks/registers/mem_reg_changing.htm">modify</a> register values</li>
+  <li><a href="../tasks/registers/mem_reg_data_views.htm">view</a> documentation for individual registers (depending on the register)</li>
+</ul>
+<p>Figure 1 shows a sample Registers view.</p>
+<p align="center"><img src="images/view_registers.png" width="367" height="370"></p>
+<p class="figure">Figure 1 - Registers View </p>
+<h5>Table 1. <span class="figure">Registers</span> view&mdash;items </h5>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="14%" scope="col">Icons</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Show Type Names </b></td>
+    <td><div align="center"><img src="../images/icons/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles the display of type names in the <span class="figure">Registers</span> view. </td>
+  </tr>
+  <tr>
+    <td><b>Show Logical Structure </b></td>
+    <td><div align="center"><img src="../images/icons/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
+    <td>Not available in C/C++ yet. </td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../images/icons/var_collapse_all_icon.png" width="17" height="18" /></div></td>
+    <td>Collapses all expanded variables into the top level. </td>
+  </tr>
+</table>
+<p align="left">For more information, see the <b>C/C++ Development User Guide &gt; Reference &gt; Debug View &gt; Registers view</b>. </p>
+<div class="step">
+  <h4>To open a Registers view </h4>
+  <ul>
+    <li>Click Window &gt; Show View &gt; Registers </li>
+    <p>A Registers view appears.</p>
+  </ul>
+</div>
+<h5>Other references </h5>
+<ul>
+  <li><a href="../concepts/registers.htm">Registers</a></li>
+  <li><a href="../concepts/arm_registers.htm">ARM Registers</a></li>
+  <li><a href="../tasks/registers/mem_reg_open_wnd.htm">Opening Register View</a></li>
+  <li><a href="../tasks/registers/mem_reg_viewing.htm">Viewing Register Values </a></li>
+  <li><a href="../tasks/registers/mem_reg_changing.htm">Changing Register Values</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
 </html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_signals_wnd.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -11,39 +11,37 @@
 <h2>Signals View</h2>
 <p>  The Signals view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one.</p>
 <p class="note"><b>NOTE</b> Currently Carbide.c++ does not  support this CDT feature.</p>
-<p>&nbsp;</p>
 <p>Figure 1 shows the Signals view.</p>
 <p align="center"><img src="../images/views/view_signals.png" width="500" height="205" /></p>
 <p class="figure">Figure 1 - Signals view</p>
 <h5>Table 1 Signals view&mdash;items </h5>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+<table width="76%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
-    <th width="36%" scope="col">Item</th>
-    <th width="64%" scope="col">Explanation</th>
+    <th width="22%" scope="col">Item</th>
+    <th width="78%" scope="col">Explanation</th>
   </tr>
   <tr>
-    <td>Name</td>
+    <td><b>Name</b></td>
     <td>Displays the name of the signal.</td>
   </tr>
   <tr>
-    <td>Pass</td>
+    <td><b>Pass</b></td>
     <td>Where &quot;yes&quot; is displayed, the debugger lets your program see the signal. Your program can handle the signal, or else it may terminate if the signal is fatal and not handled.</td>
   </tr>
   <tr>
-    <td>Suspend</td>
+    <td><b>Suspend</b></td>
     <td>Where &quot;yes&quot; is displayed, the debugger suspends your program when this signal is handled.</td>
   </tr>
   <tr>
-    <td>Description</td>
+    <td><b>Description</b></td>
     <td>Displays a description of the signal.</td>
   </tr>
 </table>
-<p>&nbsp;</p>
 <h5>Related reference </h5>
 <ul>
   <li> <a href="../debugger/debug/viewing_debug.htm">Debug view</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_symbian_kernel.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -29,6 +29,9 @@
   <li><a href="#Library">Libraries</a></li>
 </ul>
 <p class="note"><b>NOTE</b>  Information for the Chunks and Libraries tabs is not available when debugging with the TRK debug agent.</p>
+<h4><a name="overview" id="overview"></a>Overview Tab</h4>
+<p>This tab (shown in Figure 1) provides a tree view of ownership  of all processes, threads, and chunks in the OS. 
+  In contrast, the other tabs provide a flat list of corresponding kernel objects such as process, thread, chunk, library, etc.</p>
 <p align="center"><img src="images/view_symbianOSkernel.png" width="602" height="300" alt="" /></p>
 <p class="figure">Figure 1. Symbian OS Data view</p>
 <h5>Table 1 - Symbian OS Data view toolbar buttons </h5>
@@ -71,9 +74,6 @@
     <td class="Cell">Click the <b>Collaps All</b> command to collapse all of the currently elements in the view.</td>
   </tr>
 </table>
-<h4><a name="overview" id="overview"></a>Overview Tab</h4>
-<p>This tab (shown in Figure 1) provides a tree view of ownership  of all processes, threads, and chunks in the OS. 
-In contrast, the other tabs provide a flat list of corresponding kernel objects such as process, thread, chunk, library, etc.</p>
 <h4><a name="processes" id="processes"></a>Processes</h4>
 <p>The Processes tab (Figure 2) provides a flat list of corresponding kernel objects. 
 Click a column title to sort the list by the title attribute in alternating ascending and descending order. For example, you may choose to sort the process list by Name, ID, or by Priority. </p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_system_browser.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_system_browser.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -1,62 +1,62 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>System Browser View</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>System Browser View</h2>
-<p>  The System Browser view shows system level information about processes executing on various machines, like the host computer or the hardware under debugger control. The <span class="note">view</span> shows this information:</p>
-<ul>
-  <li>running processes</li>
-  <li>tasks for selected processes</li>
-  <li>some hidden processes</li>
-</ul>
-<p>Click on the expand icon for a process to view all tasks assigned to the selected process. Processes under debugger control appear in bold. Double-click a task to open it in a new Thread window, or choose the task name and click the Stack Crawl View button.</p>
-<p>Table 1  explains items in the window.</p>
-<p class="note"><b>NOTE</b> If the System Browser view does not show processes for a sepcific machine, you will need to start a debugging session for that machine. For example, you might need to debug a project that runs on external hardware in order to see executing processes for that hardware.</p>
-<h5>Table 1 System Browser <span class="note">view</span>&mdash;items </h5>
-<table width="79%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="25%" scope="col">Item</th>
-    <th width="21%" scope="col">Icon</th>
-    <th width="54%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>Attach to Process</td>
-    <td>&nbsp;</td>
-    <td>Click to have the debugger control the selected process.</td>
-  </tr>
-  <tr>
-    <td>Stack Crawl <span class="note">view</span></td>
-    <td>&nbsp;</td>
-    <td>Click to open a Thread window for the selected process.</td>
-  </tr>
-  <tr>
-    <td>Refresh</td>
-    <td>&nbsp;</td>
-    <td>This icon indicates that information for selected item is periodically updated. Click this icon to toggle between refresh and no refresh.</td>
-  </tr>
-  <tr>
-    <td>No Refresh</td>
-    <td>&nbsp;</td>
-    <td>This icon indicates that information is not updated for the selected item.</td>
-  </tr>
-  <tr>
-    <td>Expand</td>
-    <td>&nbsp;</td>
-    <td>Click to expand a process and list related tasks.</td>
-  </tr>
-</table>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../tasks/processes/opening_system_browser.htm">Opening a System Browser View</a> </li>
-  <li><a href="../tasks/processes/attach_debugger_to_process.htm">Attaching Debugger to a Process</a>  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
+<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
+<title>System Browser View</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>System Browser View</h2>
+<p>  The <b>System Browser</b> view shows system level information about processes executing on various machines, like the host computer or the hardware under debugger control. The <span class="note">view</span> shows this information:</p>
+<ul>
+  <li>running processes</li>
+  <li>tasks for selected processes</li>
+  <li>some hidden processes</li>
+</ul>
+<p>Click on the expand icon for a process to view all tasks assigned to the selected process. Processes under debugger control appear in bold. Double-click a task to open it in a new Thread window, or choose the task name and click the Stack Crawl View button.</p>
+<p>Table 1  explains items in the window.</p>
+<p class="note"><b>NOTE</b> If the System Browser view does not show processes for a specific machine, you will need to start a debugging session for that machine. For example, you might need to debug a project that runs on external hardware in order to see executing processes for that hardware.</p>
+<h5>Table 1 System Browser <span class="note">view</span>&mdash;items </h5>
+<table width="79%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="30%" scope="col">Item</th>
+    <th width="16%" scope="col">Icon</th>
+    <th width="54%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Attach to Process</b></td>
+    <td>&nbsp;</td>
+    <td>Click to have the debugger control the selected process.</td>
+  </tr>
+  <tr>
+    <td><b>Stack Crawl view</b></td>
+    <td>&nbsp;</td>
+    <td>Click to open a Thread window for the selected process.</td>
+  </tr>
+  <tr>
+    <td><b>Refresh</b></td>
+    <td>&nbsp;</td>
+    <td>This icon indicates that information for selected item is periodically updated. Click this icon to toggle between refresh and no refresh.</td>
+  </tr>
+  <tr>
+    <td><b>No Refresh</b></td>
+    <td>&nbsp;</td>
+    <td>This icon indicates that information is not updated for the selected item.</td>
+  </tr>
+  <tr>
+    <td><b>Expand</b></td>
+    <td>&nbsp;</td>
+    <td>Click to expand a process and list related tasks.</td>
+  </tr>
+</table>
+<h5>Related concepts</h5>
+<ul>
+  <li><a href="../tasks/processes/opening_system_browser.htm">Opening a System Browser View</a> </li>
+  <li><a href="../tasks/processes/attach_debugger_to_process.htm">Attaching Debugger to a Process</a>  </li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_build_prefs.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -128,12 +128,11 @@
     <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>
 <h5>Related references</h5>
 <ul>
   <li><a href="build_properties/pane_project_settings.htm">Carbide Project Settings </a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_carbide_pref.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -15,7 +15,7 @@
 <p align="center"><img src="images/carbide_preferences.png" width="627" height="544" alt="" /></p>
 <p class="figure">Figure 1 - Carbide.c++ preferences page </p>
 <h5>Table 1 Carbide.c++ Preferences &mdash;items</h5>
-<table width="700"  border="0" cellpadding="2" cellspacing="0">
+<table width="850"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="29%" scope="col">Item</th>
     <th width="57%" scope="col">Explanation</th>
@@ -56,7 +56,7 @@
   <li><a href="../tasks/sdks/sdk_platform_filter.htm">Platform Filtering Preferences</a></li>
   <li><a href="SDKPreferences.html">SDK Preferences</a></li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
 
 </body>
 </html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Thu Feb 11 16:46:41 2010 -0600
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/wnd_debug_configuration.htm	Fri Feb 12 14:45:16 2010 -0600
@@ -4,17 +4,17 @@
 <meta http-equiv="Content-Type" content="text/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>Debug Window</title>
+<title>Debug Configurations Window</title>
 <link rel="StyleSheet" href="../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
-<h2>Debug Window</h2>
-<p>The <b>Debug</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
+<h2>Debug Configurations Window</h2>
+<p>The <b>Debug Configurations</b> or launch configuration window provides C/C++ debugger options. A <a href="../projects/launch/launch_configs_overview.htm">launch configuration</a> defines the settings used by the Carbide debugger to launch and debug programs. A project must have at least one debug launch configuration in order to debug a project and can have many more. </p>
 <p>By default, Carbide creates a debug launch configuration the first time you launch the debugger based on current project settings. If additional information is required, like a port ID, the <a href="../projects/launch/wiz_new_launch_config.htm">New Launch Configuration Wizard</a>  appears asking for the additional information. </p>
 <p>The tabs in the window vary depending upon the currently selected launch configuration.</p>
-<p align="center" class="figure"><img src="images/wnd_debug_overview.png" width="864" height="471"><br />
-Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
-<h5>Table 1. Debug window &mdash; common items</h5>
+<p align="center"><img src="images/wnd_debug_overview.png" width="872" height="548"></p>
+<p align="center" class="figure">  Figure 1 - Debug or launch configuration window (Symbian OS emulation view)</p>
+<h5>Table 1. Debug Configuration window &mdash; common items</h5>
 <table width="94%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="7%" scope="col">Icon</th>
@@ -74,7 +74,7 @@
   <li><a href="../projects/launch/run_mode.htm">Run-mode overview</a></li>
   <li><a href="../projects/launch/stop_mode.htm">Stop-mode overview</a>  </li>
 </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+<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