revised variables, watchpoints pages with new images, fixed broken links in F1 help too
authorfturovic <frank.turovich@nokia.com>
Fri, 09 Jul 2010 14:17:27 -0500
changeset 1601 c8b627039298
parent 1600 58e49b4c270c
child 1603 40a2929cde0d
revised variables, watchpoints pages with new images, fixed broken links in F1 help too
core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml
core/com.nokia.carbide.cpp.doc.user/html/debugger/images/icon_add.png
core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_vew_expressions_01.png
core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_vew_expressions_02.png
core/com.nokia.carbide.cpp.doc.user/html/debugger/images/view_expressions.png
core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_add_watch_expr.png
core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_find_expressions.png
core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm
--- a/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm	Fri Jul 09 09:44:18 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/concepts/breakpoints.htm	Fri Jul 09 14:17:27 2010 -0500
@@ -1,66 +1,66 @@
-<!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>Breakpoints</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Breakpoints </h2>
-<p>  A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
-<p>A project can have multiple breakpoints set in the source code files. All breakpoints  in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within  a source code editor by selecting the <b>Run &gt; Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
-<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. The debugger must load  the symbols for a module before it can attempt to resolve  breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
-<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
-<ul>
-  <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
-  <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
-  <li><b>unresolved</b>  &#8212;  if the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function  not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
-</ul>
-<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
-<h5>Table 1 Breakpoint&mdash;type and states </h5>
-<table width="90%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="15%" scope="col">Type</th>
-    <th width="14%" scope="col">State</th>
-    <th width="14%" scope="col">Icon</th>
-    <th width="71%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td>Enabled</td>
-    <td><div align="center">Unresolved</div></td>
-    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
-    <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
-  </tr>
-  <tr>
-    <td>Enabled</td>
-    <td><div align="center">Resolved</div></td>
-    <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
-    <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
-  </tr>
-  <tr>
-    <td>Disabled</td>
-    <td><div align="center">Unresolved</div></td>
-    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
-    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-  <tr>
-    <td>Disabled</td>
-    <td><div align="center">Resolved</div></td>
-    <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
-    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
-  </tr>
-</table>
-<p>Other references </p>
-<ul>
-  <li><a href="../reference/view_executables.htm">Executables view</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
-  <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<html>
+<head>
+<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>Breakpoints Overview</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Breakpoints Overview</h2>
+<p>  A <b>breakpoint</b> is a marker set on a specific line of source code and is designed to halt program execution when encountered by the debugger. After you set a breakpoint at a key point in the program, you can halt its execution, examine its current state, and check register and variable values. You can also change values and alter the flow of normal program execution. Setting breakpoints helps you debug your program and verify its efficiency.</p>
+<p>A project can have multiple breakpoints set in the source code files. All breakpoints  in a project are shown in the <a href="../reference/view_breakpoints.htm">Breakpoints</a> view. Breakpoints are enabled or disabled on the currently selected line within  a source code editor by selecting the <b>Run &gt; Toggle Breakpoint</b> menu option, right-clicking the marker bar in the editor and selecting <b>Toggle Breakpoint</b>, or by pressing <span class="code">CTRL-SHIFT-B</span>.</p>
+<p>You can set a breakpoint on any executable line of code that the debugger can resolve. Lines containing comments and other non executable code cannot be assigned a breakpoint as they are normally stripped from the  compiled   binary. The debugger must load  the symbols for a module before it can attempt to resolve  breakpoints within the module. This is most easily done using the <a href="../reference/view_executables.htm">Executables</a> view to import a binary file, especially if the binary is not in the workspace. </p>
+<p>When the debugger attempts to resolve a breakpoint it will result in:</p>
+<ul>
+  <li><b>resolved</b> &#8212; the symbols for the module  are loaded  and the breakpoint  located in the executable that&#8217;s currently being debugged, circle icon changes to flagged icon </li>
+  <li><b>resolved and moved</b> &#8212;the breakpoint is not found in the executable at the specified point. Debugger moves breakpoint forward in the current function until a line is found that can be resolved. Breakpoint icon moved to source line matching new breakpoint location and changed to flagged icon.</li>
+  <li><b>unresolved</b>  &#8212;  if the symbols for the module  are not loaded or the breakpoint was not able to be set within the current function. This may indicate no executable code in the source line or a deadstripped function  not present in the executable. Breakpoint icon remains in unflagged state indicating unresolved status.</li>
+</ul>
+<p>Breakpoints have enabled and disabled types as well as resolved and unresolved states. Table 1 explains the different breakpoint types and states.</p>
+<h5>Table 1 Breakpoint&mdash;type and states </h5>
+<table width="90%"  border="0" cellpadding="2" cellspacing="0">
+  <tr>
+    <th width="15%" scope="col">Type</th>
+    <th width="14%" scope="col">State</th>
+    <th width="14%" scope="col">Icon</th>
+    <th width="71%" scope="col">Explanation</th>
+  </tr>
+  <tr>
+    <td>Enabled</td>
+    <td><div align="center">Unresolved</div></td>
+    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_enabled_icon.png" width="9" height="10" /></div></td>
+    <td>Indicates that the breakpoint is currently enabled but not located in the executable during a debug session. Debugger cannot halt program execution.</td>
+  </tr>
+  <tr>
+    <td>Enabled</td>
+    <td><div align="center">Resolved</div></td>
+    <td><div align="center"> <img src="../images/icons/breakpoints_enabled_icon.png" width="15" height="12" /></div></td>
+    <td>Indicates that the breakpoint is currently enabled and resolved for the source line. The debugger halts program execution at an enabled breakpoint. </td>
+  </tr>
+  <tr>
+    <td>Disabled</td>
+    <td><div align="center">Unresolved</div></td>
+    <td><div align="center"><img src="../tasks/breakpoints/images/breakpoints_disabled_icon.png" width="12" height="11" /></div></td>
+    <td>Indicates that the breakpoint is currently disabled but not located in the executable during a debug session. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+  <tr>
+    <td>Disabled</td>
+    <td><div align="center">Resolved</div></td>
+    <td><div align="center"><img src="../images/icons/breakpoints_disabled_icon.png" width="15" height="12" /></div></td>
+    <td>Indicates that the breakpoint is currently disabled and resolved for the source line. The debugger does not halt program execution at a disabled breakpoint.</td>
+  </tr>
+</table>
+<p>Other references </p>
+<ul>
+  <li><a href="../reference/view_executables.htm">Executables view</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_setting.htm">Setting Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_enable.htm">Enabling Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_disable.htm">Disabling Breakpoints</a></li>
+  <li><a href="../tasks/breakpoints/pgm_bp_clearing.htm">Clearing Breakpoints</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/context_help/eclipse_dialogs_help.xml	Fri Jul 09 09:44:18 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/context_help/eclipse_dialogs_help.xml	Fri Jul 09 14:17:27 2010 -0500
@@ -20,8 +20,12 @@
 	<!-- DEBUG VIEW                                                     -->
 	<context id="debug_view_context" >
 		<description>The Debug view shows the target debugging information in a tree hierarchy.</description>
-		<topic label="Debug view"  						href="html/reference/view_debug.htm" />
-		<topic label="Controlling debugger execution"  	href="html/concepts/working_with_debugger.htm" />
+		<topic label="Debug view"  						href="html/debugger/debug/viewing_debug.htm" />
+		<topic label="Debug Overview"  					href="html/debugger/debug/debug.htm" />
+		<topic label="Starting & Stopping"  			href="html/debugger/debug/cmds_starting.htm" />
+		<topic label="Stepping"  						href="html/debugger/debug/cmds_stepping.htm" />
+		<topic label="Suspending & Resuming"  			href="html/debugger/debug/cmds_resuming.htm" />
+		<topic label="Other Actions"  					href="html/debugger/debug/cmds_other.htm" />
 	</context>
 
 
@@ -29,9 +33,8 @@
 	<!-- VARIABLES VIEW                                                 -->
 	<context id="variable_view_context" >
 		<description>Use the Variables view to manipulate the variables or variable hierarchy used in source code.</description>
-		<topic label="Variables view"             		href="html/reference/view_variables.htm" />
-		<topic label="Show Variables View"		  		href="html/tasks/variables/show_variables_view.htm" />
-		<topic label="Showing Global Variables"	  		href="html/tasks/variables/show_global_variables.htm" />
+		<topic label="Variables view"             		href="html/debugger/variables/viewing_variables.htm" />
+		<topic label="Adding Global Variables"		  	href="html/debugger/variables/adding_variables.htm" />
 	</context>
 
 	
@@ -39,8 +42,10 @@
 	<!-- BREAKPOINTS VIEW                                               -->
 	<context id="breakpoint_view_context"  >
 		<description>Use the Breakpoints view to examine, enable or disable the breakpoints in one or more build configurations.</description>
-		<topic label="Breakpoints view"  					href="html/reference/view_breakpoints.htm" />
-		<topic label="Breakpoints" 				            href="html/concepts/breakpoints.htm" />
+		<topic label="Breakpoints view"  					href="html/debugger/breakpoints/viewing_breakpoints.htm" />
+		<topic label="Breakpoints Overview" 				href="html/concepts/breakpoints.htm" />
+		<topic label="Enabling, Disabling and Removing Breakpoints" 	href="html/debugger/breakpoints/toggling_breakpoints.htm" />
+		<topic label="Breakpoint Status Indicators " 		href="html/debugger/breakpoints/resolving_breakpoints.htm" />
 	</context>
 
 
@@ -48,10 +53,18 @@
 	<!-- EXPRESSIONS VIEW                                               -->
 	<context id="expression_view_context" >
 		<description>Use the Expressions view to monitor and manipulate variables, structures, and arrays.</description>
-		<topic label="Expressions view"  				href="html/reference/view_expressions.htm" />
-		<topic label="Adding Expressions" 				href="html/tasks/expressions/expr_adding.htm" />
-		<topic label="Editing Expressions" 				href="html/tasks/expressions/expr_editding.htm" />
-		<topic label="Removing Expressions" 			href="html/tasks/expressions/expr_removing.htm" />
+		<topic label="Expressions view"  				href="html/debugger/variables/viewing_expressions.htm" />
+		<topic label="Adding Expressions" 				href="html/debugger/variables/adding_expressions.htm" />
+		<topic label="Editing Expressions" 				href="html/debugger/variables/editing_expressions.htm" />
+	</context>
+
+
+	<!-- ============================================================== -->
+	<!-- FIND DIALOG VAR/EXPR VIEW                                      -->
+	<context id="find_element_dialog_context" >
+		<description>Find elements in view.</description>
+		<topic label="Expressions view"  			href="html/debugger/variables/viewing_expressions.htm" />
+		<topic label="Variables view" 				href="html/debugger/variables/viewing_variables.htm" />
 	</context>
 
 
@@ -280,6 +293,7 @@
 	<!-- ============================================================== -->
 	<!-- NEW WIZARD -->
 	<context id="new_wizard_selection_wizard_page_context" >
+		<label>Symbian OS</label>
 		<description>Select the project, class, or file to create.</description>
 		<topic label="New Symbian OS ++ Projects" 				href="html/tasks/CreatingNewProjects.html"/>
 		<topic label="New Symbian OS C++ Classes"				href="html/tasks/projects/prj_adding_symbian_class.htm" />
@@ -290,11 +304,10 @@
 	<!-- ============================================================== -->
 	<!-- IMPORT WIZARD                                                  -->
 	<context id="import_wizard_selection_wizard_page_context" >
+		<label>Importing projects for development or debugging.</label>
 		<description>Select the type of file to import for debugging.</description>
 		<topic label="Importing Projects from a BLD.INF File"	href="html/tasks/ImportingProjects.html"/>
 		<topic label="Importing a Symbian Executable"  			href="html/reference/projects/prj_import_exe.htm" />
-		<topic label="Carbide.c++ Perspective" 					href="html/concepts/SymbianPerspective.html" />
-		<topic label="C/C++ Project and File Properties"		href="html/reference/ProjectPreferences.html" />
 	</context>
 
     <context id="import_wizard_context">
@@ -306,8 +319,8 @@
 	<!-- ============================================================== -->
 	<!-- EXPORT WIZARD                                                  -->
 	<context id="export_wizard_selection_wizard_page_context" >
-		<description>Use the Console view to show the output of a process and provide keyboard input to a process.</description>
-		<topic label="Console view"  			href="html/reference/view_log.htm" />
+		<label>Exporting from Carbide.c++</label>
+		<topic label="Exporting Remote Connections"  		href="html/reference/trk/exporting_remote_conns.htm" />
 	</context>
 
 
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/icon_add.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_vew_expressions_01.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/menu_vew_expressions_02.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/view_expressions.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_add_watch_expr.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/debugger/images/wnd_find_expressions.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm	Fri Jul 09 09:44:18 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/variables/viewing_expressions.htm	Fri Jul 09 14:17:27 2010 -0500
@@ -20,20 +20,20 @@
   <li>Expressions list pane&#8212;Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression. Right-click to open the Expressions view context menu.</li>
   <li>Value pane&#8212;Shows the current value of each corresponding expression. Double-click a value to change it. Right-click to set viewing options.</li>
 </ul>
-<p align="center"><img src="../images/view_expressions.png" width="439" height="144"></p>
+<p align="center"><img src="../images/view_expressions.png" width="667" height="358"></p>
 <p class="figure">Figure 1 - Expressions view </p>
 <h3>Expressions view toolbar icons</h3>
 <p>The following commands appear on the Expressions 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>
+    <th width="25%" scope="col">Item</th>
+    <th width="10%" scope="col">Icons</th>
+    <th width="65%" 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 Expressions view. </td>
+    <td>Toggles the display of type names in the <strong>Expressions</strong> view. </td>
   </tr>
   <tr>
     <td><b>Show Logical Structure </b></td>
@@ -46,6 +46,12 @@
     <td>Collapses all expanded expressions into the top level. </td>
   </tr>
   <tr>
+      <td><strong>Create a New Watch Expression</strong></td>
+      <td><div align="center"><img src="../images/icon_add.png" alt="Add New Watch Expression icon" width="18" height="18"></div></td>
+      <td><p>Click to open the <strong>Add New Expression </strong>dialog. Enter the expression to add, then click <strong>OK</strong>.</p>
+        <p align="center"><img src="../images/wnd_add_watch_expr.png" alt="Add Watch Expression window" width="530" height="357"></p></td>
+  </tr>
+  <tr>
     <td><b>Remove Selected Expression </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 expressions from the expressions list. </td>
@@ -55,10 +61,16 @@
     <td><div align="center"><img src="../images/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><strong>View Menu</strong></td>
+      <td><div align="center"><img src="../images/icon_menu_white.png" alt="View menu" width="12" height="12"></div></td>
+      <td><p>Click the <strong>View Menu</strong> icon to set the layout of the <strong>Expressions</strong> view.</p>
+        <p align="center"><img src="../images/menu_vew_expressions_01.png" alt="View menu" width="326" height="158"></p></td>
+  </tr>
 </table>
 <h3>Expressions view context menu options</h3>
 <p>Right-click in the Expression's pane in the <span class="style1">Expressions</span> view to access the context menu commands shown in Figure 2.</p>
-<p align="center"><img src="../images/view_expressions_menu_cmds.png" width="226" height="223"></p>
+<p align="center"><img src="../images/menu_vew_expressions_02.png" alt="Expressions view context menu" width="429" height="408"></p>
 <p class="figure">Figure 2. <span class="style1">Expressions</span> view context menu commands (Expression list pane)</p>
 <p>The  commands include: </p>
 <table width="800"  border="0" cellpadding="2" cellspacing="0">
@@ -68,33 +80,35 @@
   </tr>
   <tr>
     <td><b>Select All</b></td>
-    <td>Selects all the expressions shown in the Expressions view.</td>
+    <td>Selects all the expressions shown in the <strong>Expressions</strong> view.</td>
   </tr>
   <tr>
     <td><b>Copy Expressions</b></td>
-    <td>Copies the selected expressions to the clipboard.</td>
+    <td><p>Copies the selected expressions to the clipboard.</p>
+        <p class="note"><strong>NOTE</strong> Only the selected expressions visible in the Expressions view are copied. Expressions 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>Remove</b></td>
-    <td>Remove the selected expressions from the Expressions view list.</td>
+    <td><p>Remove the selected expressions from the <strong>Expressions</strong> view list.</p>
+        </td>
   </tr>
   <tr>
     <td><b>Remove All</b></td>
-    <td>Remove all expressions from the Expressions view list.</td>
+    <td>Remove all expressions from the <strong>Expressions</strong> view list.</td>
   </tr>
   <tr>
     <td><b>Find...</b></td>
-    <td>Opens a <b>Find</b> dialog to search the Expressions view list.</td>
+    <td><p>Opens a <b>Find</b> dialog to search the <strong>Expressions</strong> view list. Enter the expression to search for and click <strong>OK</strong>.</p>
+        <p align="center"><img src="../images/wnd_find_expressions.png" alt="Find Expressions dialog" 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 expressions. Change the value and click <b>OK</b>.</p>
-        <p align="center"><img src="../images/wnd_set_value.png" width="401" height="214"></p></td>
+        <p align="center"><img src="../images/wnd_set_value.png" width="488" height="234"></p></td>
   </tr>
   <tr>
     <td><b>Add Watch Expression...</b></td>
-    <td><p>Opens the <a href="adding_expressions.htm">Add Watch Exression</a> dialog for creation of a new expression.</p>
-    </td>
+    <td><p>Opens the <a href="adding_expressions.htm">Add Watch Exression</a> dialog for creation of a new expression.</p>    </td>
   </tr>
   <tr>
     <td><b>Disable</b></td>
@@ -109,8 +123,32 @@
     <td>Opens the <b>Edit Watch Expression</b> dialog where you can modify the expression and enable it for automatic evaluation.</td>
   </tr>
   <tr>
-    <td><b>Reevaluate Watch Expression</b></td>
-    <td>Forces the expression to be reevaluated. Useful after the expressions has been edited or not evaluated due to being disabled.</td>
+      <td><strong>Add Watchpoint (C/C++)...</strong></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><strong>Cast To Type...</strong></td>
+      <td><p>Opens the <b>Cast to Type</b> dialog where you can assign a new type to the expression. Enter the type and click <strong>OK</strong>. </p>
+          <p>All cast expressions are then shown using the <strong>Restore Original Type</strong> menu option making them easy to identify and restore later.</p></td>
+  </tr>
+  <tr>
+      <td><strong>Display As Array...</strong></td>
+      <td>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.</td>
+  </tr>
+  <tr>
+      <td><strong>Format</strong></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><strong>Watch</strong></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>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm	Fri Jul 09 09:44:18 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/status_watchpoints.htm	Fri Jul 09 14:17:27 2010 -0500
@@ -14,7 +14,7 @@
 <ul>
   <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution  halts when encountered.</li>
   <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
-  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
+  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" />) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
 </ul>
 <p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
 <h5>Table 1 Watchpoint&mdash;stop execution chart </h5>
--- a/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Fri Jul 09 09:44:18 2010 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/debugger/watchpoints/watchpoints.htm	Fri Jul 09 14:17:27 2010 -0500
@@ -5,16 +5,16 @@
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <meta name="LASTUPDATED" content="06/17/05 11:09:43" />
 <title>Watchpoints Overview</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
 </head>
 <body bgcolor="#FFFFFF">
 <h2>Watchpoints Overview </h2>
 <p>  Use <em>watchpoints</em> (sometimes referred to as access breakpoints) to halt program execution when a specific global location is accessed. After you set a watchpoint at a key point in memory, you can halt program execution whenever that point in memory is written to or read from. You can then examine the call chain, check register and variable values, and step through your code. You can also change values and alter the flow of normal program execution.</p>
 <p>A watchpoint must be both enabled and resolved during a debug session in order to halt program execution. The  <a href="../reference/view_breakpoints.htm">Breakpoints view</a> indicates the status of any watchpoint using a set of common icons and checkmark status badge. These include:</p>
 <ul>
-  <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution  halts when encountered.</li>
-  <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
-  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png" width="16" height="16" align="absmiddle" /> ) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
+  <li>An <b>enabled</b> watchpoint has a non-gray icon (<img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" align="absmiddle" />) indicating that program execution  halts when encountered.</li>
+  <li>A <b>disabled</b> watchpoint displays a gray icon (<img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" align="absmiddle" />) indicating that program execution will not stop when encountered. </li>
+  <li>A <b>resolved</b> watchpoint has a small checkmark badge (<img src="../images/icon_watchpoint_rw_enabled_resolved.png" alt="Read Write resolved" width="16" height="16" align="absmiddle">) indicating that the debugger has located it in memory during program launch. When resolved, the debugger can halt program execution if the watchpoint is encountered.</li>
 </ul>
 <p>In effect, a watchpoint that is enabled by the user and resolved by the debugger during program launch can halt program execution. The table below shows the various states that cause the debugger to halt program execution: </p>
 <h5>Table 1 Watchpoint&mdash;stop execution chart </h5>
@@ -57,39 +57,39 @@
   <tr>
     <td rowspan="2"><b>Write</b></td>
     <td>enabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
+    <td><div align="center"><img src="../images/icon_watchpoint_write_resolved.png" width="15" height="16" /></div></td>
     <td><p>The watchpoint is activated for write access operations on the specific memory location and if resolved, will halt program execution on a write operation at the watchpoint. </p>
     </td>
   </tr>
   <tr>
     <td>disabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
+    <td><div align="center"><img src="../images/icon_watchpoint_write_disabled.png" width="16" height="16" /></div></td>
     <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a write operation. </p>
     </td>
   </tr>
   <tr>
     <td rowspan="2"><b>Read</b></td>
     <td>enabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
+    <td><div align="center"><img src="../images/icon_watchpoint_read_enabled.png" width="16" height="16" /></div></td>
     <td><p>The watchpoint is activated for read access operations on the specific memory location and if resolved, will halt program execution on a read operation at the watchpoint. </p>
     </td>
   </tr>
   <tr>
     <td>disabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
+    <td><div align="center"><img src="../images/icon_watchpoint_read_disabled.png" width="16" height="16" /></div></td>
     <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read operation. </p>
     </td>
   </tr>
   <tr>
     <td rowspan="2"><b>Write/Read</b></td>
     <td>enabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
+    <td><div align="center"><img src="../images/icon_watchpoint_rw_enabled.png" width="16" height="16" /></div></td>
     <td><p>The watchpoint is activated for both read and write access operations on the specific memory location and if resolved, will halt program execution  on any read or write operation at the watchpoint. </p>
     </td>
   </tr>
   <tr>
     <td>disabled</td>
-    <td><div align="center"><img src="../tasks/watchpoints/images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
+    <td><div align="center"><img src="../images/icon_watchpoint_rw_disabled.png" width="16" height="16" /></div></td>
     <td><p>Watchpoint is disabled for the source line, debugger does not halt program execution on a read or write operation. </p>
     </td>
   </tr>