minor edits on view pages to make them more similar
authorfturovic <frank.turovich@nokia.com>
Wed, 06 Oct 2010 15:57:37 -0500
changeset 2137 0a2167a80b64
parent 2136 f0b706fa897d
child 2138 8b2d7ec68b92
minor edits on view pages to make them more similar
core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/variables.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/view_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/perspective_debug.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_breakpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_disassembly.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_memory.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_module.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_signals.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_symbian_kernel.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/inf/INF_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/projects/mmp/MMP_Editor.html
core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_carbide_portal.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_executables.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_proj_explorer.htm
core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_sym_proj_nav.htm
core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/workspaces.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -18,7 +18,7 @@
 <body >
 <h2>Workspace Information </h2>
 <p>A workspace is the default place to store and create resources like projects, folders, and files. These are then presented to the user in a perspective which enables the presentation and manipulation of the stored resources.</p>
-<p>When Carbide is launched it asks for a workspace to open (Figure 1). As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="../debugger/variables/viewing_variables.htm">Project Explorer</a> and <a href="../projects/views/view_proj_explorer.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
+<p>When Carbide is launched it asks for a workspace to open (Figure 1). As you can have multiple workspaces, all independent from each other, choosing the workspace containing the projects to work on is important. Projects within a workspace are  shown in the Carbide workbench within the <a href="../debugger/variables/view_variables.htm">Project Explorer</a> and <a href="../projects/views/view_proj_explorer.htm">C/C++ Project</a> views. When you create a new project it is automatically added to the currently open workspace. You can import existing projects into a workspace from INF files.</p>
 <p align="center"><img src="images/wnd_workspace_launcher.png" alt="Workspace Launcher dialog" width="630" height="291"></p>
 <p class="figure">Figure 1. Workspace Launcher dialog</p>
 <p class="note"><span class="style1">WARNING</span> Bld.inf imported projects are not copied, so do not delete the contents when deleting the project.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/debug/viewing_debug.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,24 +4,25 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Debug view</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <h2>Debug view </h2>
-<p>The <b>Debug</b> view provides an overview of the debug session as it relates to the executing program. The target debugging information is shown in a tree hierarchy. The  items that appear there include:</p>
+<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.debug.ui.DebugView)")' class="command-link"><b>Debug</b></a> view provides an overview of the debug session as it relates to the executing program. The target debugging information is shown in a tree hierarchy. The  items that appear there include:</p>
 <ul>
   <li>Launch instance (<img src="../images/debug_launch_instance_icon.png" width="16" height="16" align="absmiddle" />) - launch configuration name and type </li>
   <li>Debugger instance (<img src="../images/debug_debugger_instance_icon.png" width="18" height="16" align="absmiddle" />) - debugger name and state </li>
   <li>Executable instances (<img src="../images/debug_codebug_instance_icon.png" width="17" height="17" align="absmiddle" />) - other executables called by the launch instance </li>
-  <li>Thread instance (<img src="../images/debug_thread_instance_icon.png" width="16" height="15" align="absmiddle" />) - thread number and state </li>
+  <li>Thread instance (<img src="../images/debug_thread_instance_icon.png" width="16" height="15" align="absmiddle" />) - thread number and state (Running, Suspended, etc.)</li>
   <li>Stack frame reference (<img src="../images/debug_stack_frame_instance_icon.png" width="16" height="14" align="absmiddle" />) - displays stack frame number, function, filename, and file line number when symbols are available and stack frame number, memory address, and filename when symbols are not available </li>
 </ul>
 <p class="note"><b>NOTE</b> The number beside the thread label is a reference counter, not a thread 
   identification number (TID).</p>
 <p>The CDT displays stack frames as child elements. It displays the reason for the suspension beside the thread, (such as end of stepping range, breakpoint hit, and signal received). When a program exits, the exit code is displayed.</p>
 <p>In addition to controlling the individual stepping of your programs, you can also control the debug session. You can perform actions such as terminating the session and stopping the program by using the debug launch controls available from Debug view. See Table 1 for details. </p>
-<p>Figure 1 shows the Debug view. Table 1 explains the items in the view.</p>
+<p>Figure 1 shows the <b>Debug</b> view. Table 1 explains the items in the view.</p>
 <p align="center"><img src="../images/view_debug.png" width="545" height="264" /></p>
 <p class="figure">Figure 1 - Debug view</p>
 <h5>Table 1 Debug view&mdash;items</h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/adding_variables.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -9,11 +9,11 @@
 </head>
 <body >
 <h2>Adding and Removing Global Variables </h2>
-<p>The <a href="viewing_variables.htm">Variables</a> view can also display global variables used by the program. Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. There you can select one or more global variables to display in the Variables view, clickiing <b>OK</b> when done. </p>
+<p>The <a href="view_variables.htm">Variables</a> view can also display global variables used by the program. Right-click in the <a href="view_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. There you can select one or more global variables to display in the Variables view, clickiing <b>OK</b> when done. </p>
 <p align="center"><img src="../images/wnd_global_variables.png" alt="Global Variables window" width="359" height="452"></p>
 <p class="figure">Figure 1 - Global Variables selection dialog</p>
 <h4>Removing Global Variables</h4>
-<p>Right-click in the <a href="viewing_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. Locate and uncheckmark the global variable to stop displaying, then click <b>OK</b>. This removes the selected global variable from the variables list.</p>
+<p>Right-click in the <a href="view_variables.htm">Variables</a> view and select the <b>Add Global Variables</b> menu option to open the <b>Global Variables</b> dialog. Locate and uncheckmark the global variable to stop displaying, then click <b>OK</b>. This removes the selected global variable from the variables list.</p>
 <h5>Other references</h5>
 <ul>
   <li><a href="variables.htm">Variables and Expressions Overview</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/variables.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/variables.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -9,14 +9,10 @@
 </head>
 <body >
 <h2>Variables and Expressions Overview </h2>
-<p>Variables are symbols used in programs to store values or expressions that can change during the life of the program. Being able to view a variable's value is helpful when debugging a program. Expressions are the result of one or more variables being combined to produce a result based on the variable values and the way they are calculated. Variables are shown in the <a href="viewing_variables.htm">Variables</a> view while expressions are shown in the <a href="viewing_expressions.htm">Expressions</a> view.</p>
+<p>Variables are symbols used in programs to store values or expressions that can change during the life of the program. Being able to view a variable's value is helpful when debugging a program. Expressions are the result of one or more variables being combined to produce a result based on the variable values and the way they are calculated. Variables are shown in the <a href="view_variables.htm">Variables</a> view while expressions are shown in the <a href="viewing_expressions.htm">Expressions</a> view.</p>
 <p>The following  cover various variable and expression concepts and actions: </p>
 <ul>
-  <li><a href="viewing_variables.htm">Viewing Variables</a> 
-    <ul>
-      <li><a href="adding_variables.htm">Adding and Removing Global Variables</a></li>
-    </ul>
-  </li>
+  <li><a href="view_variables.htm">Variables view</a></li>
   <li><a href="viewing_expressions.htm">Viewing Expressions
     </a>
     <ul>
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/view_variables.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -0,0 +1,157 @@
+<!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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<title>Variables view</title>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
+</head>
+<body >
+<h2>Variables view</h2>
+<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.debug.ui.VariableView)")' class="command-link"><b>Variables</b></a> view allows manipulation of project  variables and the variable hierarchy used in the source code. For example, you can change the variable format, change a variable value, add watch expressions, or add global variables. </p>
+<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled. The default view shows the variables list and include the Name and Value for all the variables within scope. In addition, when you select a variable its value is also shown in a different pane within the view.</p>
+<p align="center"><img src="../images/view_variables.png" width="551" height="281"></p>
+<p class="figure">Figure 1 - Variables view </p>
+<h3>Variables view toolbar icons</h3>
+<p>The following commands appear on the <b>Variables</b> view toolbar: </p>
+<table width="88%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="34%" scope="col">Item</th>
+    <th width="14%" scope="col">Icons</th>
+    <th width="52%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Show Type Names </b></td>
+    <td><div align="center"><img src="../images/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
+    <td>Toggles the display of type names in the <b>Variables</b> view. </td>
+  </tr>
+  <tr>
+    <td><b>Show Logical Structure </b></td>
+    <td><div align="center"><img src="../images/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
+    <td>Not available in C/C++ yet. </td>
+  </tr>
+  <tr>
+    <td><b>Collapse All </b></td>
+    <td><div align="center"><img src="../images/var_collapse_all_icon.png" width="17" height="18" /></div></td>
+    <td>Collapses all expanded variables into the top level. </td>
+  </tr>
+  <tr>
+    <td><b>Add Global Variables </b></td>
+    <td><div align="center"><img src="../images/var_add_global_vars_icon.png" width="19" height="19" /></div></td>
+    <td><p>Click to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </p>
+        <p class="note"><b>NOTE</b> Not yet implemented in C3, use <b>View Menu &gt; Show Globals Defined in this File</b> menu option instead.</p></td>
+  </tr>
+  <tr>
+    <td><b>Remove Selected Global Variables </b></td>
+    <td><div align="center"><img src="../images/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
+    <td>Click to remove all currently selected global variables from the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>Remove All Global Variables </b></td>
+    <td><div align="center"><img src="../images/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
+    <td>Click to remove all global variables from the variables list. </td>
+  </tr>
+  <tr>
+    <td><b>View Menu</b></td>
+    <td><div align="center"><img src="../images/icon_menu_white.png" width="12" height="12"></div></td>
+    <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only and customize the columns shown in the view.</p>
+        <p align="center"><img src="../images/menu_view_variables_01.png" alt="View menu" width="373" height="158"></p>
+        <p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or   show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like &ldquo;i&rdquo; for your loops  and ones that may no longer have accurate values.</p></td>
+  </tr>
+</table>
+<h3>Variables view context menu options</h3>
+<p>Right-click in the <b>Variables</b> view to access the commands on the Variables view context menu.</p>
+<p align="center"><img src="../images/menu_view_variables_02.png" alt="Variables view context menu" width="424" height="344"></p>
+<p class="figure">Figure 2. Variables view context menu commands</p>
+<p>The  commands include: </p>
+<table width="100%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="27%" scope="col">Item</th>
+    <th width="62%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td><b>Select All</b></td>
+    <td>Selects all the variables shown in the <b>Variables</b> view.</td>
+  </tr>
+  <tr>
+    <td><b>Copy Variables</b></td>
+    <td><p>Copies the selected variables to the clipboard.</p>
+        <p class="note"><strong>NOTE</strong> Only the selected variables visible in the Variables view are copied. Variables listed outside the boundary of the view are not in memory and can't be copied at this time.</p></td>
+  </tr>
+  <tr>
+    <td><b>Enable</b></td>
+    <td>Enables the selected variable.</td>
+  </tr>
+  <tr>
+    <td><b>Disable</b></td>
+    <td>Disables the selected variable.</td>
+  </tr>
+  <tr>
+    <td><b>Cast To Type...</b></td>
+    <td><p>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the variable. Enter the type and click <strong>OK</strong>. </p>
+        <p>All cast variables are then shown using the <strong>Restore Original Type</strong> menu option making them easy to identify and restore later.</p>
+        <p align="center"><img src="../images/wnd_cast_to_type.png" alt="Cast To Type window" width="488" height="197"></p>
+        </td>
+  </tr>
+  <tr>
+      <td><strong>Display As Array...</strong></td>
+      <td><p>Opens the <strong>Display as Array</strong> dialog where you can set array parameters to show the variables. Enter the <strong>Start index</strong> and <strong>Length</strong>, then click <strong>OK</strong> to update how the variables are shown in the Variables view.</p>
+        <p align="center"><img src="../images/wnd_display_as_array.png" alt="Display as Array" width="488" height="195"></p></td>
+  </tr>
+  <tr>
+    <td><b>View Memory</b></td>
+    <td>Opens a <a href="../views/view_memory.htm">Memory</a> view on the selected variable so you can examine it.</td>
+  </tr>
+  <tr>
+      <td><b>Format</b></td>
+      <td><p>Change the selected variable's  display format. The default setting is Natural, or the format assigned when the variable is defined. For example, the decimal value of 256 would appear as:</p>
+              <ul>
+                  <li>Binary (<span class="code">0b100000</span>)</li>
+                  <li>Natural (<span class="code">256</span>)</li>
+                  <li>Decimal (<span class="code">256</span>)</li>
+                  <li>Hexadecimal (<span class="code">0x100</span>)</li>
+              </ul></td>
+  </tr>
+  <tr>
+    <td><b>Find...</b></td>
+    <td><p>Opens a <b>Find</b> dialog to search for variables. Enter the variable to search for and click <strong>OK</strong>.</p>
+        <p align="center"><img src="../images/wnd_find_variables.png" alt="Find window" width="398" height="437"></p></td>
+  </tr>
+  <tr>
+    <td><b>Change Value...</b></td>
+    <td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected variable. Change the value and click <b>OK</b>.</p>
+    <p align="center"><img src="../images/wnd_set_value.png" width="488" height="234"></p></td>
+  </tr>
+  <tr>
+      <td><b>Add Global Variables...</b></td>
+      <td><p>Select  to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </p>
+        <p class="note"><b>NOTE</b> Not yet implemented in C3, use <b>View Menu &gt; Show Globals Defined in this File</b> menu options instead.</p></td>
+  </tr>
+  <tr>
+      <td><b>Remove Global Variables</b></td>
+      <td><p>Remove the selected global variables from the Variables view.</p>
+        <p class="note"><b>NOTE</b> Not yet implemented in C3, use <b>View Menu &gt; Show Globals Defined in this File</b> menu options instead.</p></td>
+  </tr>
+  <tr>
+      <td><b>Remove All Global Variables</b></td>
+      <td>Remove all  global variables from the Variables view.</td>
+  </tr>
+  <tr>
+    <td><b>Add Watchpoint (C/C++)...</b></td>
+    <td><p>Opens the <a href="../watchpoints/setting_watchpoints.htm">Add Watchpoint</a> dialog enabling you to define a watchpoint on the variable.</p>
+        <p align="center"><img src="../images/wnd_add_watchpoint.png" alt="Add Watchpoint window" width="238" height="253"></p></td>
+  </tr>
+  <tr>
+    <td><b> Watch</b></td>
+    <td>Creates a watchpoint on the selected variable and displays it in the <a href="../watchpoints/watchpoints.htm">Watchpoint</a> view. </td>
+  </tr>
+</table>
+<h5>Other references</h5>
+<ul>
+  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_variables.htm	Wed Oct 06 14:30:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Viewing Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body >
-<h2>Viewing Variables </h2>
-<p>The <b>Variables</b> view allows manipulation of project  variables and the variable hierarchy used in the source code. For example, you can change the variable format, change a variable value, add watch expressions, or add global variables. </p>
-<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled. The default view shows the variables list and include the Name and Value for all the variables within scope. In addition, when you select a variable its value is also shown in a different pane within the view.</p>
-<p align="center"><img src="../images/view_variables.png" width="551" height="281"></p>
-<p class="figure">Figure 1 - Variables view </p>
-<h3>Variables view toolbar icons</h3>
-<p>The following commands appear on the Variables view toolbar: </p>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="14%" scope="col">Icons</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Show Type Names </b></td>
-    <td><div align="center"><img src="../images/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles the display of type names in the <b>Variables</b> view. </td>
-  </tr>
-  <tr>
-    <td><b>Show Logical Structure </b></td>
-    <td><div align="center"><img src="../images/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
-    <td>Not available in C/C++ yet. </td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../images/var_collapse_all_icon.png" width="17" height="18" /></div></td>
-    <td>Collapses all expanded variables into the top level. </td>
-  </tr>
-  <tr>
-    <td><b>Add Global Variables </b></td>
-    <td><div align="center"><img src="../images/var_add_global_vars_icon.png" width="19" height="19" /></div></td>
-    <td>Click to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove Selected Global Variables </b></td>
-    <td><div align="center"><img src="../images/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
-    <td>Click to remove all currently selected global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All Global Variables </b></td>
-    <td><div align="center"><img src="../images/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
-    <td>Click to remove all global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>View Menu</b></td>
-    <td><div align="center"><img src="../images/icon_menu_white.png" width="12" height="12"></div></td>
-    <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only and customize the columns shown in the view.</p>
-        <p align="center"><img src="../images/menu_view_variables_01.png" alt="View menu" width="373" height="158"></p>
-        <p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or   show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like &ldquo;i&rdquo; for your loops  and ones that may no longer have accurate values.</p></td>
-  </tr>
-</table>
-<h3>Variables view context menu options</h3>
-<p>Right-click in the <b>Variables</b> view to access the commands on the Variables view context menu.</p>
-<p align="center"><img src="../images/menu_view_variables_02.png" alt="Variables view context menu" width="424" height="344"></p>
-<p class="figure">Figure 2. Variables view context menu commands</p>
-<p>The  commands include: </p>
-<table width="100%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="27%" scope="col">Item</th>
-    <th width="62%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Select All</b></td>
-    <td>Selects all the variables shown in the <b>Variables</b> view.</td>
-  </tr>
-  <tr>
-    <td><b>Copy Variables</b></td>
-    <td><p>Copies the selected variables to the clipboard.</p>
-        <p class="note"><strong>NOTE</strong> Only the selected variables visible in the Variables view are copied. Variables listed outside the boundary of the view are not in memory and can't be copied at this time.</p></td>
-  </tr>
-  <tr>
-    <td><b>Enable</b></td>
-    <td>Enables the selected variable.</td>
-  </tr>
-  <tr>
-    <td><b>Disable</b></td>
-    <td>Disables the selected variable.</td>
-  </tr>
-  <tr>
-    <td><b>Cast To Type...</b></td>
-    <td><p>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the variable. Enter the type and click <strong>OK</strong>. </p>
-        <p>All cast variables are then shown using the <strong>Restore Original Type</strong> menu option making them easy to identify and restore later.</p>
-        <p align="center"><img src="../images/wnd_cast_to_type.png" alt="Cast To Type window" width="488" height="197"></p>
-        </td>
-  </tr>
-  <tr>
-      <td><strong>Display As Array...</strong></td>
-      <td><p>Opens the <strong>Display as Array</strong> dialog where you can set array parameters to show the variables. Enter the <strong>Start index</strong> and <strong>Length</strong>, then click <strong>OK</strong> to update how the variables are shown in the Variables view.</p>
-        <p align="center"><img src="../images/wnd_display_as_array.png" alt="Display as Array" width="488" height="195"></p></td>
-  </tr>
-  <tr>
-    <td><b>View Memory</b></td>
-    <td>Opens a <a href="../views/view_memory.htm">Memory</a> view on the selected variable so you can examine it.</td>
-  </tr>
-  <tr>
-      <td><b>Format</b></td>
-      <td><p>Change the selected variable's  display format. The default setting is Natural, or the format assigned when the variable is defined. For example, the decimal value of 256 would appear as:</p>
-              <ul>
-                  <li>Binary (<span class="code">0b100000</span>)</li>
-                  <li>Natural (<span class="code">256</span>)</li>
-                  <li>Decimal (<span class="code">256</span>)</li>
-                  <li>Hexadecimal (<span class="code">0x100</span>)</li>
-              </ul></td>
-  </tr>
-  <tr>
-    <td><b>Find...</b></td>
-    <td><p>Opens a <b>Find</b> dialog to search for variables. Enter the variable to search for and click <strong>OK</strong>.</p>
-        <p align="center"><img src="../images/wnd_find_variables.png" alt="Find window" width="398" height="437"></p></td>
-  </tr>
-  <tr>
-    <td><b>Change Value...</b></td>
-    <td><p>Opens the <b>Set Value</b> dialog where you can modify the value assigned to the selected variable. Change the value and click <b>OK</b>.</p>
-    <p align="center"><img src="../images/wnd_set_value.png" width="488" height="234"></p></td>
-  </tr>
-  <tr>
-      <td><b>Add Global Variables...</b></td>
-      <td>Select  to open the <a href="adding_variables.htm">Global Variables</a> dialog where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
-  </tr>
-  <tr>
-      <td><b>Remove Global Variables</b></td>
-      <td>Remove the selected global variables from the Variables view.</td>
-  </tr>
-  <tr>
-      <td><b>Remove All Global Variables</b></td>
-      <td>Remove all  global variables from the Variables view.</td>
-  </tr>
-  <tr>
-    <td><b>Add Watchpoint (C/C++)...</b></td>
-    <td><p>Opens the <a href="../watchpoints/setting_watchpoints.htm">Add Watchpoint</a> dialog enabling you to define a watchpoint on the variable.</p>
-        <p align="center"><img src="../images/wnd_add_watchpoint.png" alt="Add Watchpoint window" width="238" height="253"></p></td>
-  </tr>
-  <tr>
-    <td><b> Watch</b></td>
-    <td>Creates a watchpoint on the selected variable and displays it in the <a href="../watchpoints/watchpoints.htm">Watchpoint</a> view. </td>
-  </tr>
-</table>
-<h5>Other references</h5>
-<ul>
-  <li><a href="variables.htm">Variables and Expressions Overview</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/perspective_debug.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/perspective_debug.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -16,7 +16,7 @@
   <li><a href="../debug/viewing_debug.htm">Debug</a> view - displays information about a suspended process during a debug session</li>
   <li><a href="view_variables.htm">Variables</a> view - allows manipulation of variables used in source code</li>
   <li><a href="view_breakpoints.htm">Breakpoints</a> view - allows manipulation of breakpoints and watchpoints</li>
-  <li><a href="view_symbian_kernel.htm">Symbian OS Data</a> view - shows kernel data in the Symbian running on the device being debugged</li>
+  <li><a href="view_symbian_kernel.htm">Symbian Data</a> view - shows kernel data in the Symbian running on the device being debugged</li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_editor_view.htm">Editor</a> view - one or more source code editor windows </li>
   <li><a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a> view - displays an outline of a structured C/C++ file that is currently open in the 
     editor view </li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_breakpoints.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_breakpoints.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,15 +4,18 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Breakpoints View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <h2>Breakpoints View </h2>
-<p>Use the <b>Breakpoints</b> view to <a href="../../tasks/breakpoints/pgm_bp_setting.htm">set</a>, <a href="../../tasks/breakpoints/pgm_bp_view_props.htm">examine</a>, <a href="../../tasks/breakpoints/pgm_bp_enable.htm">enable</a>,  <a href="../../tasks/breakpoints/pgm_bp_disable.htm">disable</a>, and <a href="../../tasks/breakpoints/pgm_bp_clearing.htm">remove</a> breakpoints and <a href="../../tasks/watchpoints/pgm_watchpoints.htm">watchpoints</a> in one or more <a href="../../concepts/build_configurations.htm">build configurations</a>. Table 1  explains items in the view.</p>
+<p>Use the <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.debug.ui.BreakpointView)")' class="command-link"><b>Breakpoints</b></a> view to <a href="../../tasks/breakpoints/pgm_bp_setting.htm">set</a>, <a href="../../tasks/breakpoints/pgm_bp_view_props.htm">examine</a>, <a href="../../tasks/breakpoints/pgm_bp_enable.htm">enable</a>,  <a href="../../tasks/breakpoints/pgm_bp_disable.htm">disable</a>, and <a href="../../tasks/breakpoints/pgm_bp_clearing.htm">remove</a> breakpoints and <a href="../../tasks/watchpoints/pgm_watchpoints.htm">watchpoints</a> in one or more <a href="../../concepts/build_configurations.htm">build configurations</a>. Table 1  explains items in the view.</p>
 <p align="center"><img src="../../reference/images/view_breakpoints.png" width="544" height="264" /></p>
 <p class="figure">Figure 1 - Breakpoints view</p>
-<h5>Table 1. Breakpoints view&mdash;items </h5>
+<h2>Breakpoints view toolbar options </h2>
+<p>The following options are present on the <b>Breakpoints</b> toolbar:</p>
+<h5>Table 1. Breakpoints view toolbar options </h5>
 <table width="100%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
     <th width="27%" scope="col">Item</th>
@@ -60,13 +63,16 @@
     <td>When enabled, the breakpoint shown in the editor view is also highlighted in the Breakpoints view. When disabled, the breakpoint selected in the Breakpoints view does not change. </td>
   </tr>
   <tr>
-    <td><b>Menu</b></td>
+    <td><b>View Menu</b></td>
     <td><div align="center"><img src="../../reference/images/icon_breakpoint_menu.png" width="16" height="9" /></div></td>
     <td>Click to display additional Breakpoint view options for paths and working sets. </td>
   </tr>
 </table>
+  <h2>Breakpoints view context menu options </h2>
+  <p>The following options are present on the <b>Breakpoints </b>context menu:</p>
+  <p>&nbsp;</p>
   <h5>Other  references</h5>
-  <ul>
+<ul>
     <li><a href="perspective_debug.htm">Debug Perspective </a></li>
     <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
     <li><a href="../../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_disassembly.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_disassembly.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,6 +4,7 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Disassembly Window</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 <style type="text/css">
@@ -17,7 +18,7 @@
 </head>
 <body >
 <h2>Disassembly View</h2>
-<p>  When debugging your application, the <b>Disassembly</b> view shows the loaded program as assembler instructions. When you use the Disassembly view, you can do the following tasks:</p>
+<p>When debugging your application, the <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.cdt.dsf.debug.ui.disassembly.view)")' class="command-link"><b>Disassembly</b></a> view shows the loaded program as assembler instructions. When you use the Disassembly view, you can do the following tasks:</p>
 <ul>
   <li>Step through the disassembly instructions of your program using the <b>Instruction Stepping Mode</b> (<img src="../../reference/images/icon_instr_stepping_mode.png" width="18" height="16" align="absmiddle">) icon in the <a href="../debug/viewing_debug.htm">Debug</a> view (Figure 1). </li>
   <li>Reposition the PC  using the various move commands (Figure 1) by first selecting the line to move to, then select the command from the context menu.</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_expressions.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_expressions.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,18 +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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Expressions Window</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <h2>Expressions View </h2>
-<p>  Use the <b>Expressions</b> view to monitor and manipulate:</p>
+<p>Use the <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.debug.ui.ExpressionView)")' class="command-link"><b>Expressions</b></a> view to inspect frequently used variables as their values change during a debugging session. You can 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 panes: </p>
+<p>The <b>Expressions</b> view displays these panes: </p>
 <ul>
   <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>
@@ -23,6 +24,17 @@
 <p>Figure 1 shows the <b>Expressions</b> view.</p>
 <p align="center"><img src="../../reference/images/view_expressions.png" width="439" height="144" /></p>
 <p class="figure">Figure 1 - Expressions view </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 (C/C++) menu item</li>
+        <p>An <b>Expressions</b> view appears in the current perspective.</p>
+    </ul>
+</div>
+<h3>Expressions view toolbar icons</h3>
+<p>The following commands appear on the <b>Expressions</b> view toolbar: </p>
 <h5>Table 1. Expressions view &mdash;items </h5>
 <table width="88%"  border="0" cellpadding="2" cellspacing="0">
   <tr>
@@ -47,7 +59,7 @@
     </tr>
     <tr>
       <td><b>New Watch Expression</b></td>
-      <td>&nbsp;</td>
+      <td><div align="center"><img src="../images/icon_add.png" alt="New Watch Expression icon" width="18" height="18"></div></td>
       <td>Click to open the <b>Add Watch Expression</b> dialog.</td>
     </tr>
     <tr>
@@ -61,24 +73,14 @@
       <td>Click to remove all expressions from the expressions list. </td>
     </tr>
     <tr>
-      <td><b>Refresh</b></td>
+      <td><b>View Menu</b></td>
       <td><center>
+          <img src="../../reference/images/icon_menu_white.png" alt="View menu icon" width="12" height="12">
       </center>
       </td>
-      <td>Click to refresh view display.</td>
+      <td>Click to specify the Layout options for the <b>Expressions</b> view.</td>
     </tr>
 </table>
-<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 (C/C++) menu item</li>
-    <p>An Expressions view appears in the current perspective.</p>
-  </ul>
-</div>
 <h5>Related tasks</h5>
 <ul>
   <li><a href="../variables/adding_expressions.htm">Adding &amp; Removing Expressions</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_memory.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_memory.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,12 +4,13 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Memory view</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <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>
+<p>  Use the <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.debug.ui.MemoryView)")' class="command-link"><b>Memory</b></a> 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_module.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_module.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,12 +4,13 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Modules View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <h2>Modules View</h2>
-<p>The <b>Modules</b> view displays a list of modules loaded while debugging your program. The listed modules can be selected to show related information. You can open the Modules view in the <a href="../../projects/views/perspective_carbide.htm">Carbide C/C++</a> perspective by selecting <b>Window &gt; Show view &gt; Other...</b>, then expand the Debug folder and select Modules. In the <a href="perspective_debug.htm">Debug</a> perspective select <b>Window &gt; Show view &gt; Modules</b>.</p>
+<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.debug.ui.ModuleView)")' class="command-link"><b>Modules</b></a> view displays a list of modules loaded while debugging your program. The listed modules can be selected to show related information. You can open the Modules view in the <a href="../../projects/views/perspective_carbide.htm">Carbide C/C++</a> perspective by selecting <b>Window &gt; Show view &gt; Other...</b>, then expand the Debug folder and select Modules. In the <a href="perspective_debug.htm">Debug</a> perspective select <b>Window &gt; Show view &gt; Modules</b>.</p>
 <p>The Modules view is only loaded during a debug session and closes when the debug session ends. Select the running man icon to list the Type, Symbols, and Symbols file for the executable. Select the stack of books icon to list the Type, Symbols, Symbols file, and Base address for the shared library. </p>
 <p>Figure 1 shows the Modules view.</p>
 <p align="center"><img src="../../images/views/view_module.png" width="595" height="181" /></p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_signals.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_signals.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,12 +4,13 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Signals view</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <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. Figure 1 shows the Signals view.</p>
+<p>  The <b>Signals</b> view of the Debug perspective lets you view the signals defined on the selected debug target and how the debugger handles each one. 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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_symbian_kernel.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_symbian_kernel.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -10,7 +10,7 @@
 </head>
 <body >
 <h2>Symbian Data view</h2>
-<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.debug.kernelaware.ui.SymbianOSView)")'>Symbian Data</a> view displays the processes and threads for the suspended debug session based on the selection in the <a href="../debug/viewing_debug.htm">Debug</a> view. Read-only data is displayed for ARM build configurations. To open the Symbian Data view select<b> Window &gt; Show View &gt; Symbian Data</b> when the <a href="perspective_debug.htm">Debug</a> perspective is visible or select <b>Window &gt; Show View &gt; Other...</b>, then expand the Carbide.c++ folder and select <b>Symbian Data</b> when the <a href="../../projects/views/perspective_carbide.htm">Carbide C/C++ perspective</a> is visible. Click <b>Ok</b> to display the Symbian Data window (Figure 1).</p>
+<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.debug.kernelaware.ui.SymbianOSView)")' class="command-link"><b>Symbian Data</b></a> view displays the processes and threads for the suspended debug session based on the selection in the <a href="../debug/viewing_debug.htm">Debug</a> view. Read-only data is displayed for ARM build configurations. To open the Symbian Data view select<b> Window &gt; Show View &gt; Symbian Data</b> when the <a href="perspective_debug.htm">Debug</a> perspective is visible or select <b>Window &gt; Show View &gt; Other...</b>, then expand the Carbide.c++ folder and select <b>Symbian Data</b> when the <a href="../../projects/views/perspective_carbide.htm">Carbide C/C++ perspective</a> is visible. Click <b>Ok</b> to display the Symbian Data window (Figure 1).</p>
 <p class="note"><b>NOTE</b> The Symbian Data view works with the debugger and will only display data during a live debug session. The Symbian Data view is not supported for emulator debugging, and will not show anything during emulator debug.</p>
 <p>The <b>Symbian Data</b> view reveals kernel data in the Symbian running on the device being debugged. The kernel data displayed is always that of the device with the currently selected thread or process in <a href="../debug/viewing_debug.htm">Debug</a> view. If you are debugging two devices at the same time, the content of the view will change when focus is switched from a thread on one device to a thread on another device. The kernel data includes more than just processes and threads. </p>
 <p>For the stop mode debugger and the crash debugger, all the data listed above is supported. For the Application and Symbian Device debuggers, the chunks and libraries views are not supported. The Symbian Data view is not supported for the emulator debugger and will show nothing during an emulator debug session. During a stop mode debug session or a CODA debug session, you are able to select a process or a thread in the Symbian Data view and attach the debugger to it for source level debugging if the binary  is listed in the <a href="../../projects/views/view_executables.htm">Executables</a> view. Binaries listed in the Executable view can be source level debugged. Binaries  not listed in the Executables view can only be assembly code debugged in the <a href="view_disassembly.htm">Disassembly</a> view.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/views/view_variables.htm	Wed Oct 06 14:30:50 2010 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<meta http-equiv="Content-Style-Type" content="text/css" />
-<meta name="LASTUPDATED" content="06/17/05 11:09:43" />
-<title>Variables View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body >
-<h2>Variables View </h2>
-<p>The <b>Variables</b> view allows manipulation of the variables or variable hierarchy used in source code. For example, you can change the variable format, change a variables value, add watchpoints, and add global variables. In addition to the standard C/C++, Symbian, and the Qt data types: <span class="code">QString</span>, <span class="code">QByteArray</span>, <span class="code">QSet</span>, <span class="code">QHash</span>, <span class="code">QMap</span>, <span class="code">QVector</span>, <span class="code">QList</span>, <span class="code">QLinkedList</span> and <span class="code">Qvariant</span>.</p>
-<p>Figure 1 shows the Variables view with <b>Show Type Names</b> option enabled.</p>
-<p align="center"><img src="../../images/views/view_variables.png" width="544" height="221" /></p>
-<p class="figure">Figure 1 - Variables view showing type names </p>
-<h5>Table 1. Variables view&mdash;items </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="34%" scope="col">Item</th>
-    <th width="14%" scope="col">Icons</th>
-    <th width="52%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td><b>Show Type Names </b></td>
-    <td><div align="center"><img src="../../images/icons/var_toggle_type_names_icon.png" width="19" height="19" /></div></td>
-    <td>Toggles the display of type names in the Variables view. </td>
-  </tr>
-  <tr>
-    <td><b>Show Logical Structure </b></td>
-    <td><div align="center"><img src="../../images/icons/var_show_logical_struct_icon.png" width="19" height="19" /></div></td>
-    <td>Not available in C/C++ yet. </td>
-  </tr>
-  <tr>
-    <td><b>Collapse All </b></td>
-    <td><div align="center"><img src="../../images/icons/var_collapse_all_icon.png" width="17" height="18" /></div></td>
-    <td>Collapses all expanded variables into the top level. </td>
-  </tr>
-  <tr>
-    <td><b>Add Global Variables </b></td>
-    <td><div align="center"><img src="../../images/icons/var_add_global_vars_icon.png" width="19" height="19" /></div></td>
-    <td>Click to open a window where you can select one or more global variables to display in the Variables view. Global variables appear at the top of the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove Selected Global Variables </b></td>
-    <td><div align="center"><img src="../../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
-    <td>Click to remove all currently selected global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Remove All Global Variables </b></td>
-    <td><div align="center"><img src="../../images/icons/var_remove_all_globals_icon.png" width="19" height="19" /></div></td>
-    <td>Click to remove all global variables from the variables list. </td>
-  </tr>
-  <tr>
-    <td><b>Menu</b></td>
-    <td><div align="center"><img src="../../reference/images/icon_menu_white.png" width="12" height="12"></div></td>
-    <td><p>Enables you to modifiy the <b>Layout</b> to change the view orientation between: horizontal, vertical, or variables pane only.</p>
-    <p>In addition, use <b>Show All Variables</b> to toggle between showing only those variables that are in scope and live or   show all local variables, even if redundant. With this option on you will see all of the variables including the multiple defined variables like &ldquo;i&rdquo; for your loops  and ones that may no longer have accurate values.</p></td>
-  </tr>
-</table>
-<div class="step">
-  <h4>To open the Variables view </h4>
-  <ul>
-    <li>Click Window &gt; Show View &gt; Variables </li>
-	<p>The Variables view appears.</p>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/common_debug_actions.htm">Common Debug Actions </a></li>
-  <li><a href="../../concepts/working_with_memory.htm">Working with Memory</a></li>
-  <li><a href="../../concepts/working_with_variables.htm">Working with Variables</a> </li>
-</ul>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="perspective_debug.htm">Showing the Variables View</a> </li>
-  <li><a href="perspective_debug.htm">Showing Global Variables</a> </li>
-</ul>
-<h5>Related References </h5>
-<ul>
-  <li><a href="view_expressions.htm">Expressions View</a></li>
-  <li><a href="../../concepts/working_with_variables.htm">Variables View</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/inf/INF_Editor.html	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/inf/INF_Editor.html	Wed Oct 06 15:57:37 2010 -0500
@@ -1,5 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html><head>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>INF Editor</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
@@ -7,9 +8,9 @@
    <h2>INF Editor - Overview Tab</h2>
    
    <p>
-   The <b>INF Editor</b> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's <span class="code">.INF</span> file. You can view the <span class="code">.INF</span> file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
+   The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.project.ui.editors.BldInfEditor)")' class="command-link"><b>INF Editor</b></a> allows you to view and modify Symbian project files and export files to be included in building your application. The settings displayed are those active for the active build configuration. However, changes made in the INF editor can be applied globally to all build configurations. Changes made in the INF editor are automatically written to the project's <span class="code">.INF</span> file. You can view the <span class="code">.INF</span> file by selecting the bld.inf tab located along the bottom of the INF editor.</p>
 <p>
-	  The INF Editor is shown when an INF  file is
+	  The <b>INF Editor</b> is shown when an INF  file is
    opened from the <a href="../views/view_proj_explorer.htm">Project Explorer</a> view or <a href="../views/view_sym_proj_nav.htm">Symbian Project Navigator</a> view by double-clicking on the file. The INF Editor is shown in Figure 1.</p>
    <p align="center"><img src="../../reference/images/inf_editor_overview.png" width="727" height="626" /></p>
    <p align="left" class="figure">Figure 1 - INF Editor</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/mmp/MMP_Editor.html	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/mmp/MMP_Editor.html	Wed Oct 06 15:57:37 2010 -0500
@@ -1,5 +1,6 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html><head>
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>MMP Editor</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
@@ -7,7 +8,7 @@
    <h2>MMP Editor</h2>
    
    <p>
-   The MMP Editor <strong>Overview</strong> tab allows you to view and modify your project definitions.  Changes made in the MMP editor are automatically written to the project's .MMP file. You can view the .mmp file by selecting the <em>project_name</em>.mmp tab located along the bottom of the MMP editor.</p>
+   The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.mmpEditor.MMPEditor)")' class="command-link"><b>MMP Editor</b></a> <strong>Overview</strong> tab allows you to view and modify your project definitions.  Changes made in the MMP editor are automatically written to the project's .MMP file. You can view the .mmp file by selecting the <em>project_name</em>.mmp tab located along the bottom of the MMP editor.</p>
    <p>
 	  The MMP Editor is shown when an MMP  file is
    opened from the <a href="../views/view_proj_explorer.htm">Project Explorer</a> or <a href="../views/view_sym_proj_nav.htm">Symbian Project Navigator</a> views. The MMP Editor is shown in Figure 1. MMP editor fields are validated for existing or correct entries. For example, if the UID 2 field is blank the label is highlighted in red. If an error exists in the mmp file, the line where the error occurs is marked and also displayed in the Problems view.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_carbide_portal.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_carbide_portal.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -10,13 +10,16 @@
 <body >
 <h2>Carbide.c++ Portal  view</h2>
 <p>The <strong>Carbide.c++ Portal</strong>  view provides a single point of information on Carbide news, new releases, additional extensions, and support. The<strong> Carbide.c++ Portal</strong><strong> </strong>view is shown by clicking <strong>Help &gt; Carbide.c++ Portal</strong>.</p>
-<p align="center"><img src="../../reference/images/view_carbide_portal.png" width="840" height="548"></p>
+<h2>Welcome section</h2>
+<p>The <b>Welcome</b> section provides links to Carbide information on blogs, wikis, and more.</p>
+<h5></h5>
+<h2>Customize section</h2>
+<p>The <b>Customize</b> section provides options for installing additional Carbide extensions.</p>
+<p align="center"><img src="../../reference/images/view_carbide_portal.png" alt="Customize section of Carbide.c++ Portal" width="840" height="548"></p>
 <p class="figure">Figure 1. Customize page in the Carbide.c++ Portal view</p>
 <p>If the <b>Show Installed</b> option is checkmarked, the list only shows the extensions  currently installed. To show more information on a specific extension click the <img src="../../reference/images/icon_show_overview.png" alt="Show Overview icon" width="18" height="18" align="absmiddle"> (Show Overview) icon (Figure 2).</p>
 <p align="center"><img src="../../reference/images/view_show_overview_popup.png" width="748" height="349"></p>
 <p class="figure">Figure 2. Extension information popup </p>
-<h2>Install section</h2>
-<p>The Install section provides options for installing additional Carbide extensions.</p>
 <h5>Table 1. Install options </h5>
 <table width="83%"  border="0" cellpadding="2" cellspacing="0">
     <tr>
@@ -44,7 +47,7 @@
         <td>Launches the <strong>Install New Software</strong> wizard.</td>
     </tr>
 </table>
-<h2>Migrate section</h2>
+<h4>Migrate section</h4>
 <p>The Migrate section provides options for saving or restoring the custom settings.</p>
 <h5>Table 2. Migrate options </h5>
 <table width="83%"  border="0" cellpadding="2" cellspacing="0">
@@ -61,7 +64,7 @@
         <td><p>Click to import a saved feature configuration settings file.</p></td>
     </tr>
 </table>
-<h2>Settings section  </h2>
+<h4>Settings section  </h4>
 <p>The Settings section provides access to several common ways to customize the Carbide program.</p>
 <h5>Table 3. Settings options </h5>
 <table width="83%"  border="0" cellpadding="2" cellspacing="0">
@@ -86,6 +89,10 @@
         <td>Click to open the <b>Network Connections</b> preference panel to change proxy settings.</td>
     </tr>
 </table>
+<h2>Kits section</h2>
+<p>Use the <b>Kits</b> section to install, manage, or remove SDKs from your working environment.</p>
+<h2>Support section</h2>
+<p>The <b>Support</b> section provides links to getting Carbide support and to file bugs.</p>
 <h5>Related references </h5>
 <ul>
   <li><a href="perspective_carbide.htm">Carbide C/C++ perspective</a></li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_executables.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_executables.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,12 +4,13 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Executables view</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <h2>Executables view </h2>
-<p>  The <b>Executables</b> view provides a dynamic list of executables and their related source files. The Executables view makes it easy to:</p>
+<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.cdt.debug.ui.executablesView)")' class="command-link"><b>Executables</b></a> view provides a dynamic list of executables and their related source files. The Executables view makes it easy to:</p>
 <ul>
   <li>target all binaries for debugging because the symbolics are automatically loaded when a bld.inf is imported or a project is created from a template</li>
   <li>debug a binary that is not part of a project in the workspace by importing it into the Executables view to load the symbolics</li>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_proj_explorer.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_proj_explorer.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -4,12 +4,13 @@
 <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" />
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Project Explorer View</title>
 <link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body >
 <h2>Project Explorer view </h2>
-<p>  The <b>Project Explorer</b> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the current workspace. The view is customizable and takes advantage of working sets. </p>
+<p>  The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.navigator.ProjectExplorer)")' class="command-link"><b>Project Explorer</b></a> view (Figure 1) display<span><span>s  relevant C/C++ projects located in the current workspace using a tree structure</span></span>. Use this view to manage all the projects located in the current workspace. The view is customizable and takes advantage of working sets. </p>
 <p>The content of a project is dependent upon how it was created in the workspace.</p>
 <p align="center"><img src="../../reference/images/view_project_explorer.png" alt="Project Explorer view" width="281" height="424"></p>
 <p class="figure">Figure 1 - Project Explorer view showing projects in the current workspace</p>
--- a/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_sym_proj_nav.htm	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/projects/views/view_sym_proj_nav.htm	Wed Oct 06 15:57:37 2010 -0500
@@ -10,7 +10,7 @@
 </head>
 <body >
 <h2>Symbian Project Navigator  view</h2>
-<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.project.ui.views.SymbianProjectNavigatorView)")'>Symbian Project Navigator</a> view shows all files that belong to the
+<p>The <img src="../../images/command_link.png" border="0" alt="" /> <a href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=com.nokia.carbide.cpp.project.ui.views.SymbianProjectNavigatorView)")' class="command-link"><b>Symbian Project Navigator</b></a> view shows all files that belong to the
 current build configuration. This view lists the Symbian projects in your current workspace and their corresponding *.inf file (typically <span class="code">bld.inf</span>). The *.inf file contains the related MMP project files, which are also listed in a tree structure.  You can collapse or expand the list for each MMP to see which sources  belong to each MMP.</p>
 <p>To open this view select <b>Window &gt; Show View &gt; Symbian Project Navigator</b>, or select <b>Window &gt; Show View &gt; Other ...</b> and expand the Carbide.c++ folder then choose Symbian Project Navigator. </p>
 <p>Figure 1 shows the Symbian Project Navigator view.</p>
--- a/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Oct 06 14:30:50 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/tocCarbide.xml	Wed Oct 06 15:57:37 2010 -0500
@@ -316,7 +316,6 @@
         <topic label="Adding and removing global variables" 	href="html/debugger/variables/adding_variables.htm" />
       </topic>
       <topic label="Viewing expressions" 						href="html/debugger/variables/viewing_expressions.htm" >
-        <topic label="Adding and removing expressions" 		href="html/debugger/variables/adding_expressions.htm" />
         <topic label="Editing expressions" 					href="html/debugger/variables/editing_expressions.htm" />
       </topic>
     </topic>