removed unused pages and images for watchpoints, variables, and expressions
authorfturovic <frank.turovich@nokia.com>
Wed, 02 Sep 2009 12:54:52 -0500
changeset 475 bb1095fec5b3
parent 474 255538df147a
child 476 1e1ad434efb1
removed unused pages and images for watchpoints, variables, and expressions
core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/expressions/expr_adding.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/expressions/expr_editing.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/expressions/expr_removing.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/variables/set_variable_formats.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/variables/show_global_variables.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/variables/show_variables_view.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_read_disabled.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_read_enabled.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_rw_disabled.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_rw_enabled.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_write_disabled.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_write_enabled_resolved.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_write_resolved.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/watchpoint_disabled.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/watchpoint_enabled.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/wnd_add_watchpoint.png
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_watchpoints.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_clearing.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_conditional.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_disable.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_enable.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_setting.htm
core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_view_props.htm
core/com.nokia.carbide.cpp.doc.user/index.xml
--- a/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Wed Sep 02 11:38:14 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/html/reference/view_expressions.htm	Wed Sep 02 12:54:52 2009 -0500
@@ -1,79 +1,78 @@
-<!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>Expressions Window</title>
-<link rel="StyleSheet" href="../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Expressions View </h2>
-<p>  The <b>Expressions</b> view helps you monitor and manipulate these  items:</p>
-<ul>
-  <li>global and local variables</li>
-  <li>structure members</li>
-  <li>array elements</li>
-</ul>
-<p>The Expressions view displays these columns: </p>
-<ul>
-  <li>Expression column&#8212;Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression view.</li>
-  <li>Value column&#8212;Shows the current value of each corresponding expression. Double-click a value to change it.</li>
-</ul>
-<p>Figure 1 shows the Expressions view. Table 1 explains items in view.</p>
-<p align="center"><img src="images/view_expressions.png" width="439" height="144" /></p>
-<p class="figure">Figure 1 - Expressions view </p>
-<h5>Table 1. Expressions 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 Expressions 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 expressions into the top level. </td>
-    </tr>
-    <tr>
-      <td><b>Remove Selected Expression </b></td>
-      <td><div align="center"><img src="../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
-      <td>Click to remove all currently selected expressions from the expressions list. </td>
-    </tr>
-    <tr>
-      <td><b>Remove All Expressions </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 expressions from the expressions list. </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 command </li>
-    <p>An Expressions view appears in the current perspective.</p>
-  </ul>
-</div>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="../tasks/expressions/expr_adding.htm">Adding Expressions</a></li>
-  <li><a href="../tasks/expressions/expr_editing.htm">Editing Expressions</a></li>
-  <li><a href="../tasks/expressions/expr_removing.htm">Removing Expressions</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</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>Expressions Window</title>
+<link rel="StyleSheet" href="../../book.css" type="text/css"/>
+</head>
+<body bgcolor="#FFFFFF">
+<h2>Expressions View </h2>
+<p>  The <b>Expressions</b> view helps you monitor and manipulate these  items:</p>
+<ul>
+  <li>global and local variables</li>
+  <li>structure members</li>
+  <li>array elements</li>
+</ul>
+<p>The Expressions view displays these columns: </p>
+<ul>
+  <li>Expression column&#8212;Lists expressions and expression hierarchies. Click the hierarchical controls to expand or collapse the expression view.</li>
+  <li>Value column&#8212;Shows the current value of each corresponding expression. Double-click a value to change it.</li>
+</ul>
+<p>Figure 1 shows the Expressions view. Table 1 explains items in view.</p>
+<p align="center"><img src="images/view_expressions.png" width="439" height="144" /></p>
+<p class="figure">Figure 1 - Expressions view </p>
+<h5>Table 1. Expressions 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 Expressions 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 expressions into the top level. </td>
+    </tr>
+    <tr>
+      <td><b>Remove Selected Expression </b></td>
+      <td><div align="center"><img src="../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" /></div></td>
+      <td>Click to remove all currently selected expressions from the expressions list. </td>
+    </tr>
+    <tr>
+      <td><b>Remove All Expressions </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 expressions from the expressions list. </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 command </li>
+    <p>An Expressions view appears in the current perspective.</p>
+  </ul>
+</div>
+<h5>Related tasks</h5>
+<ul>
+  <li><a href="../debugger/variables/adding_expressions.htm">Adding &amp; Removing Expressions</a></li>
+  <li><a href="../debugger/variables/editing_expressions.htm">Editing Expressions</a></li>
+</ul>
+<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
+
+</body>
+</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/expressions/expr_adding.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +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>Adding Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Adding Expressions</h2>
-<p>You can add adding expressions for inspection using a variety of views, including   <a href="../../reference/view_expressions.htm">Expressions</a>, <a href="../../reference/view_variables.htm">Variables</a>, and editor views . </p>
-<p>You can enter any valid C/C++ expression, for example:</p>
-<blockquote>
-  <p class="code">2 + 2<br>
-    myVariable + 8<br>
-    &amp;myVariable<br>
-    myClass.myMemberVar<br>
-  etc.</p>
-</blockquote>
-<p>Are all valid expressions that the Expression view can monitor and display. However, the expression cannot call a function or execute code. The following example will not work:</p>
-<blockquote>
-  <p class="code">std:strlen(&quot;Hello&quot;);   </p>
-</blockquote>
-<div class="step">
-      <h4>Adding Expressions</h4>
-      <ul>
-        <li>In the Expressions view </li>
-          <ol>
-            <li>Right-click in the Expressions view and select Add Watch Expression</li>
-            <p>The <b>Add Watch Expression</b> window (Figure 1) appears.</p>
-            <p class="figure"><img src="../../reference/images/wnd_add_watch_expr.png" width="439" height="303" /></p>
-            <p class="figure">Figure 1 - Add Watch Expression window </p>
-            <li>Enter the expression to watch in the Add Watch Expression window</li>
-            <li>Click OK </li>
-            <p>The <b>Add Watch Expression</b> window closes and the expression appears in the <b>Expressions</b> view.</p>
-          </ol>
-          <li>In the Variables view</li>
-          <ol>
-            <li>Right-click a variable in the Variables view to open a context menu</li>
-            <li>Select Watch</li>
-            <p>The <b>Add Watch Expression</b> window appears. Verify the expression to watch.</p>
-            <li>Click OK </li>
-            <p>The <a href="../../reference/view_expressions.htm">Expressions</a> view appears displaying the new expression.</p>
-          </ol>
-        <li>In an editor view </li>
-          <ol>
-            <li>Right-click a variable in the source file to open the context menu </li>
-			<li>Select Add Watch Expression...</li>
-			<p>The <b>Add Watch Expression</b> window appears. Verify the expression to watch.</p>
-			<li>Click OK </li>
-			<p>The <b>Add Watch Expression</b> window closes and the <a href="../../reference/view_expressions.htm">Expressions</a> view appears displaying the new expression.</p>
-          </ol>
-      </ul>
-</div>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="expr_editing.htm">Editing Expressions </a></li>
-  <li><a href="expr_removing.htm">Removing Expressions</a></li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../reference/view_expressions.htm">Expressions View</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/expressions/expr_editing.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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>Editing Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Editing Expressions</h2>
-<p> You can edit any <a href="expr_adding.htm">valid</a> C/C++ expression in the <a href="../../reference/view_expressions.htm">Expressions</a> view using  <b>Edit Watch Expression</b>. </p>
-<div class="step">
-  <h4>Editing Expressions</h4>
-  <ol>
-    <li>Right-click an expression and select Edit Watch Expression</li>
-  <p>The <b>Edit Watch Expression</b> window (Figure 1) appears.</p>
-  <p align="center"><img src="../../reference/images/wnd_edit_watch_expr.png" width="439" height="303" /></p>
-  <p class="figure">Figure 1 - Edit Watch Expression window </p>
-  <li>Modify the expression in the Expression text box.</li>
-    <li>Click OK.</li>
-  <p>The modified expression appears in the Expressions view. </p>
-  </ol>
-</div>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="expr_removing.htm">Editing Expressions </a></li>
-  <li><a href="expr_removing.htm">Removing Expressions</a></li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../reference/view_expressions.htm">Expressions View</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/expressions/expr_removing.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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>Removing Expressions</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Removing Expressions</h2>
-<p>The <a href="../../reference/view_expressions.htm">Expressions</a> view handles various ways of removing expressions that no longer require inspection. </p>
-<div class="step">
-<h4>Removing an Expression from the Expressions view</h4>
-    <ul>
-      <li>Select the expression and click the Remove Expression icon (<img src="../../images/icons/var_remove_selected_globals_icon.png" width="18" height="16" align="absmiddle" />)</li>
-    </ul>
-      <blockquote>
-        <p>or</p>
-      </blockquote>
-      <ul>
-        <li>Right-click the expression to remove and select Remove Expression </li>
-      <p>The Expressions view updates to reflect the removed expression.</p>
-      </ul>
-</div>
-<div class="step">
-<h4>Removing All Expressions from the Expressions view</h4>
-    <ul>
-      <li>Click the Remove All Expressions icon (<img src="../../images/icons/var_remove_all_globals_icon.png" width="19" height="19" align="absmiddle" />)</li>
-    </ul>
-      <blockquote>
-        <p>or</p>
-      </blockquote>
-      <ul>
-        <li>Right-click insie the Expression view and select Remove All Expressions </li>
-        <p>The Expressions view updates to show no expressions.</p>
-      </ul>
-</div>
-<h5>Related tasks</h5>
-<ul>
-  <li><a href="expr_adding.htm">Adding Expressions</a></li>
-  <li><a href="expr_removing.htm">Editing Expressions </a></li>
-</ul>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../reference/view_expressions.htm">Expressions View</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/variables/set_variable_formats.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +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>Setting Variable Formats</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting Variable Formats</h2>
-<p>You can change the way the <a href="../../reference/view_variables.htm">Variables</a> view displays data. For example, you can add labels to variable data so that those labels appear in the Variables view and clarify the displayed data.</p>
-<p>For example, suppose you have the structure defined in Listing 1.</p>
-<div class="listing">
-  <h5>Listing 1 Sample structure definition</h5>
-  <p class="listing">struct Rect {<br />
-    short top;<br />
-    short left;<br />
-    short bottom;<br />
-    short right;<br />
-  };</p>
-</div>
-<p>The Variables view might show an instance of the Rect structure like this:</p>
-<p class="listing">myRect 0x000DCEA8</p>
-<p>You can create an XML file that defines a new way to display the structure, as shown in Listing 2.</p>
-<div class="listing">
-  <h5>Listing 2 Sample variable format definition</h5>
-  <p class="listing">&lt;variableformats&gt;<br />
-&lt;variableformat&gt;<br />
-&lt;osname&gt;osWin32&lt;/osname&gt;<br />
-&lt;runtimename&gt;runtimeWin32&lt;/runtimename&gt;<br />
-&lt;typename&gt;Rect&lt;/typename&gt;<br />
-&lt;expression&gt;<br />
-&quot;{T: &quot; + ^var.top + <br />
-&quot; L: &quot; + ^var.left + <br />
-&quot; B: &quot; + ^var.bottom + <br />
-&quot; R: &quot; + ^var.right +<br />
-&quot;}{H: &quot; + (^var.bottom - ^var.top) + <br />
-&quot; W: &quot; + (^var.right - ^var.left) + &quot;}&quot;<br />
-&lt;/expression&gt;<br />
-&lt;/variableformat&gt;<br />
-&lt;/variableformats&gt;</p>
-</div>
-<p>Given this new variable format definition, the Variables view now shows the same <span class="code">myRect</span> instance like this:</p>
-<p class="listing">myRect {T: 30 L: 30 B: 120 R: 120}{H: 90 W: 90}</p>
-<p>To manipulate variable formats, you place an XML file that defines the new format inside the VariableFormats directory at</p>
-<blockquote>
-  <p class="code">&lt;CARBIDE&gt;\plugins\com.nokia.carbide.cpp.support_2.0.0.xxx\Debugger\Plugins\Support\VariableFormats</p>
-</blockquote>
-<p>where <span class="code">Carbide</span> is the path to your Carbide installation.</p>
-<p>The IDE reads the XML files in this directory to determine how to display variable data. Table 1 explains the main XML tags that the IDE recognizes.</p>
-<h5>Table 1 Variable formats&mdash;XML tags </h5>
-<table width="83%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="24%" scope="col">Tag</th>
-    <th width="76%" scope="col">Explanation</th>
-  </tr>
-  <tr>
-    <td class="code">variableformats</td>
-    <td>A group of variable format records.</td>
-  </tr>
-  <tr>
-    <td class="code">variableformat</td>
-    <td>An individual variable format record.</td>
-  </tr>
-  <tr>
-    <td class="code">osname</td>
-    <td>The operating system that defines the scope of this record.</td>
-  </tr>
-  <tr>
-    <td class="code">runtimename</td>
-    <td>The runtime that defines the scope of this record.</td>
-  </tr>
-  <tr>
-    <td class="code">typename</td>
-    <td>The name of the Type that this record will format.</td>
-  </tr>
-  <tr>
-    <td class="code">expression</td>
-    <td>The expression that reformats the variable display. The IDE evaluates this expression to determine the format that it applies to the variable. The IDE replaces all occurrences of the ^var placeholder with the name of the variable.</td>
-  </tr>
-</table>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../reference/view_variables.htm">Variables View</a> </li>
-  <li><a href="show_variables_view.htm">Opening a Variables View</a></li>
-  <li><a href="show_global_variables.htm">Showing Global Variables</a></li>
-  <li><a href="../../concepts/working_with_variables.htm">Working with Variable</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/variables/show_global_variables.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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>Showing Global Variables</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Showing Global Variables</h2>
-<p>The <a href="../../reference/view_variables.htm">Variables</a> view can also display global variables used by the program. Use the Add Global Variables command to select which global variables are displayed in the Variables view. </p>
-<p align="center"><img src="../../images/views/wnd_select_global_variables.png" width="345" height="430" /></p>
-<p class="figure">Figure 1 - Select global variables window</p>
-<div class="step">
-  <h4>To show global variables</h4>
-  <ol>
-    <li>Right-click in the Variables view, then select Add Global Variables from the  context menu, or click the Add Global Variables button (<img src="../../images/icons/btn_add_global_vars.png" width="19" height="19" align="absmiddle" />) </li>
-    <p>The <b>Global Variables</b> dialog box appears (Figure 1). </p>
-    <li>Select one or more global variables from the Select Variables list</li>
-    <li>Click OK</li>
-	<p>The selected global variables are added to the <a href="../../reference/view_variables.htm">Variables</a> view.</p>
-  </ol>
-</div>
-  <h5>Related references</h5>
-  <ul>
-  <li><a href="../../reference/view_variables.htm">Variables view</a> </li>
-    <li><a href="set_variable_formats.htm">Setting Variable Formats</a></li>
-    <li><a href="show_variables_view.htm">Opening a Variables View</a></li>
-    <li><a href="../../concepts/working_with_variables.htm">Working with Variables</a></li>
-  </ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
\ No newline at end of file
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/variables/show_variables_view.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +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>Opening the Variables View</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/></head>
-<body bgcolor="#FFFFFF">
-<h2>Opening a Variables View</h2>
-<p>Use the <a href="../../reference/view_variables.htm">Variables</a> view to show a single variable or variable hierarchy used in source code.</p>
-<div class="step">
-  <h4>To open a Variables view</h4>
-  <ul>
-    <li>Click Window &gt; Show View &gt; Variables </li>
-  </ul>
-</div>
-<h5>Related references</h5>
-<ul>
-  <li><a href="../../reference/view_variables.htm">Variables View</a> </li>
-  <li><a href="set_variable_formats.htm">Setting Variable Formats</a></li>
-  <li><a href="show_global_variables.htm">Showing Global Variables</a></li>
-  <li><a href="../../concepts/working_with_variables.htm">Working with Variables</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
\ No newline at end of file
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_read_disabled.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_read_enabled.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_rw_disabled.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_rw_enabled.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_rw_enabled_resolved.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_write_disabled.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_write_enabled_resolved.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/icon_watchpoint_write_resolved.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/watchpoint_disabled.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/watchpoint_enabled.png has changed
Binary file core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/images/wnd_add_watchpoint.png has changed
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_watchpoints.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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>Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Watchpoints</h2>
-<p>This section describes how to setup and use watchpoints to monitor memory locations. The topics include: </p>
-<ul>
-  <li><a href="pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-  <li><a href="pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_clearing.htm">Clearing Watchpoints</a></li>
-  <li><a href="../breakpoints/pgm_bp_conditional.htm">Setting Conditional Watchpoints</a>  (in <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view) </li>
-  <li><a href="../../reference/view_breakpoints.htm">Viewing Watchpoints</a> (in <a href="../../reference/view_breakpoints.htm">Breakpoints</a> view) </li>
-</ul>
-<p class="note"><b>NOTE</b> Watchpoints are only available for emulator build configurations. </p>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/watchpoints.htm">Watchpoints</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_clearing.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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>Clearing Watchpoints</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Clearing Watchpoints</h2>
-<p>Use the <b>Toggle Watchpoint</b> menu item to clear a watchpoint.</p>
-<div class="step">
-  <h4>Clearing a Watchpoint</h4>
-  <ul>
-    <li>Select the global variable to clear the watchpoint on </li>
-    <p>The global variable is highlighted in the source file. </p>
-    <p class="note"><b>NOTE</b> If a global variable is not selected the Toggle Watchpoint menu item will remain disabled. </p>
-    <li>Click the Run &gt; Toggle Watchpoint menu item </li>
-    <p>The  watchpoint is removed from  the <a href="../../reference/view_breakpoints.htm">Breakpoints view</a> list, and the appropriate <a href="../../concepts/watchpoints.htm">watchpoint status icon</a> disappears from the marker bar next to the global variable. </p>
-  </ul>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/watchpoints.htm">Watchpoints</a></li>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
-  <li><a href="pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-  <li><a href="pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_clearing.htm">Clearing Watchpoints</a> </li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a>  </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_conditional.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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>Setting a Conditional Watchpoint</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting Conditional Watchpoints</h2>
-<p>  Use the <b>Properties</b> view to set a conditional watchpoint. A conditional watchpoint has an associated conditional expression. The debugger evaluates the expression to determine whether to halt program execution at that watchpoint.</p>
-<p>A conditional watchpoint behaves in two different ways:</p>
-<ul>
-  <li>If the expression evaluates to <span class="code">true</span> (a non-zero value), the debugger halts program execution when the memory location associated with the watchpoint changes value.</li>
-</ul>
-<ul>
-  <li>If the expression evaluates to <span class="code">false</span> (a zero value), program execution continues without stopping.</li>
-</ul>
-<div class="step">
-  <h4>To set a Conditional Watchpoint</h4>
-  <ol>
-    <li>Find the watchpoint that you want to associate with a conditional expression in the Breakpoints view </li>
-    <li>Right-click the watchpoint, then select the Properties menu item </li>
-    <p>The Properties view appears.</p>
-    <li>Enter an expression in the Condition text box</li>
-    <p>During subsequent debugging sessions, the debugger evaluates the expression to determine whether to halt program execution at the conditional watchpoint.
-</p>
-    <li>Click OK </li>
-    <p>The watchpoint's Proeprties window closes. </p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/watchpoints.htm">Watchpoints</a></li>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
-  <li><a href="pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-  <li><a href="pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_clearing.htm">Clearing Watchpoints</a></li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_disable.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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>Disabling a Watchpoint</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Disabling a Watchpoint</h2>
-<p>  Disable a watchpoint to prevent it from affecting program execution. The disabled watchpoint remains at the memory location at which you set it, so that you can enable it later.</p>
-<p align="center"><img src="images/watchpoint_disabled.png" width="245" height="15" /></p>
-<p class="figure">Figure 1. Disabled watchpoint example in Breakpoints view </p>
-<div class="step">
-  <h4>Disabling Watchpoints</h4>
-  <ul>
-    <li>Click the checkbox next to the watchpoint in the Breakpoints view list</li>
-  </ul>
-  <ol>
-    <p>An empty  checkbox (<img src="../../images/icons/icon_uncheckmark_box.png" width="15" height="15" align="absmiddle" />)  next to the  watchpoint indicates the watchpoint is disabled. </p>
-  </ol>
-</div>
-
-  <h5>Related concepts</h5>
-  <ul>
-    <li><a href="../../concepts/watchpoints.htm">Watchpoints</a></li>
-    <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-  </ul>
-  <h5>Related tasks </h5>
-  <ul>
-    <li><a href="pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-    <li><a href="pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-    <li><a href="pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-    <li><a href="pgm_wpt_clearing.htm">Clearing Watchpoints</a> </li>
-  </ul>
-<h5>Related references </h5>
-  <ul>
-    <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a> </li>
-  </ul>
-  <div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_enable.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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>Enabling a Watchpoint</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Enabling a Watchpoint</h2>
-<p>  Enable a watchpoint to have it halt program execution when its associated memory location changes value. Enabling a watchpoint that you previously disabled is easier than clearing it and re-creating it from scratch.</p>
-<p align="center"><img src="images/watchpoint_enabled.png" width="244" height="16" /></p>
-<p class="figure">Figure 1. Enabled watchpoint example in Breakpoints view </p>
-<div class="step">
-  <h4>Enabling Watchpoints</h4>
-  <ul>
-    <li>Click the checkbox next to the watchpoint in the Breakpoints view list</li>
-  </ul>
-  <ol>
-    <p>A  checkmark in the checkbox (<img src="../../images/icons/icon_checkmark_box.png" width="15" height="15" align="absmiddle" />)  next to the watchpoint indicates the watchpoint is enabled. </p>
-  </ol>
-</div>
-
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/watchpoints.htm">Watchpoints</a></li>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
-  <li><a href="pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-  <li><a href="pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_clearing.htm">Clearing Watchpoints</a> </li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_setting.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +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>Setting a Watchpoint</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Setting a Watchpoint</h2>
-<p>Use the <b>Toggle Watchpoint</b> command to set a watchpoint on a global variable in a C/C++ editor view. A watchpoint suspends program execution when the memory location that you specify is accessed with a write or read operation and it's based on the access setting. Watchpoints can also be added directly in the <a href="../../reference/view_variables.htm">Variables</a>,  <a href="../../reference/view_breakpoints.htm">Breakpoints</a>, <a href="PLUGINS_ROOT/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm">Outline</a>, and the <a href="../../reference/view_memory_wnd.htm">Memory Rendering</a> views. </p>
-<p>The debugger halts program execution on the line of source code that triggered the watchpoint. This is different than a breakpoint, which halts program execution prior to executing the line of source code on which the breakpoint is set.</p>
-<ol>
-  <p align="center"><img src="images/wnd_add_watchpoint.png" width="220" height="237" /></p>
-  <p class="figure">Figure 1. Add Watchpoint window </p>
-</ol>
-<h5>Table 1. Add Watchpoint options </h5>
-<table width="88%"  border="0" cellpadding="2" cellspacing="0">
-  <tr>
-    <th width="32%" scope="col">Name</th>
-    <th width="52%" scope="col">Description</th>
-  </tr>
-  <tr>
-    <td><div align="left"><b>Expression to watch </b></div></td>
-    <td>If not already entered, you can enter any arbitrary memory location for watching. </td>
-  </tr>
-  <tr>
-    <td><b>Units</b></td>
-    <td>Define the size of the units to monitor. This setting defaults to the size of the variable to watch. If an arbitrary memory address is entered, then the default unit size is set to 1 byte. Once you enable the units checkbox, you're must enter a value for it.</td>
-  </tr>
-  <tr>
-    <td><b>Access: Write/Read </b></td>
-    <td>Check the appropriate access type to trigger  the watchpoint for the specified memory location. </td>
-  </tr>
-</table>
-<div class="step">
-  <h4>Setting a Watchpoint</h4>
-  <p>The following steps work with C/C++ editor views, as well as the <b>Variables</b>, <b>Breakpoints</b>, and <b>Outline</b> views: </p>
-  <p class="note"><b>NOTE</b> Watchpoints are  shown in the Outline view, while breakpoints are not.</p>
-  <ol>
-    <li>Right-click any global variable in the view </li>
-    <p>The global variable is highlighted in the source file. </p>
-    <li>Select the  Toggle Watchpoint menu item </li>
-    <p>The <b>Add Watchpoint</b>  window appears (Figure 1).</p>
-    <li>Select the Access type for the watchpoint (write, read, or select both) </li>
-    <p>Click to set a checkmark in the <b>Write</b>, <b>Read</b>, or both checkboxes at once. </p>
-    <li>Click OK </li>
-    <p>The <b>Add Watchpoint</b> window closes, the new watchpoint appears in the <a href="../../reference/view_breakpoints.htm">Breakpoints view</a> list, and the appropriate <a href="../../concepts/watchpoints.htm">watchpoint status icon</a> appears in the marker bar next to the global variable. </p>
-  </ol>
-</div>
-<div class="step">
-  <h4>Setting a Watchpoint in Memory Rendering Views </h4>
-  <ol>
-    <li>Right-click any global variable address previously added to the Memory Rendering view </li>
-    <p>The global variable is highlighted in the source file. </p>
-    <li>Select the  Add Watchpoint (C/C++) menu item </li>
-    <p>The <b>Add Watchpoint</b> window appears (Figure 1).</p>
-    <li>Select the Access type for the watchpoint (write, read, or select both) </li>
-    <p>Click to set a checkmark in the <b>Write</b>, <b>Read</b>, or both checkboxes at once. </p>
-    <li>Click OK </li>
-    <p>The <b>Add Watchpoint</b> window closes, the new watchpoint appears in the <a href="../../reference/view_breakpoints.htm">Breakpoints view</a> list, and the appropriate <a href="../../concepts/watchpoints.htm">watchpoint status icon</a> appears in the marker bar next to the global variable. </p>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/watchpoints.htm">Watchpoints</a></li>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
-  <li><a href="pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-  <li><a href="pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_clearing.htm">Clearing Watchpoints</a> </li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a> </li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/html/tasks/watchpoints/pgm_wpt_view_props.htm	Wed Sep 02 11:38:14 2009 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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 Watchpoint Properties</title>
-<link rel="StyleSheet" href="../../../book.css" type="text/css"/>
-</head>
-<body bgcolor="#FFFFFF">
-<h2>Viewing Watchpoint Properties</h2>
-<p>  After you set a watchpoint, you can view and modify its properties.</p>
-<div class="step">
-  <h4>To view properties for a watchpoint</h4>
-  <ol>
-    <li>Select its name in the Breakpoints view </li>
-    <li>Click Breakpoints &gt; Breakpoint Properties</li>
-  </ol>
-</div>
-<h5>Related concepts</h5>
-<ul>
-  <li><a href="../../concepts/watchpoints.htm">Watchpoints</a></li>
-  <li><a href="../../concepts/breakpoints.htm">Breakpoints</a></li>
-</ul>
-<h5>Related tasks </h5>
-<ul>
-  <li><a href="pgm_wpt_setting.htm">Setting Watchpoints</a></li>
-  <li><a href="pgm_wpt_enable.htm">Enabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_disable.htm">Disabling Watchpoints</a></li>
-  <li><a href="pgm_wpt_clearing.htm">Clearing Watchpoints</a> </li>
-</ul>
-<h5>Related references </h5>
-<ul>
-  <li><a href="../../reference/view_breakpoints.htm">Breakpoints view</a></li>
-</ul>
-<div id="footer">Copyright &copy; 2009 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. <br>License: <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a></div>
-
-</body>
-</html>
--- a/core/com.nokia.carbide.cpp.doc.user/index.xml	Wed Sep 02 11:38:14 2009 -0500
+++ b/core/com.nokia.carbide.cpp.doc.user/index.xml	Wed Sep 02 12:54:52 2009 -0500
@@ -36,17 +36,15 @@
     </entry>
 
 	<entry keyword="breakpoints">
-	   <topic href="html/tasks/breakpoints/pgm_bp_disable.htm" label="Disabling"/>
-	   <topic href="html/tasks/breakpoints/pgm_bp_enable.htm" label="Enabling"/>
-	   <topic href="html/tasks/breakpoints/pgm_bp_exporting.htm" label="Export Breakpoints"/>	   
-	   <topic href="html/tasks/breakpoints/pgm_bp_importing.htm" label="Import Breakpoints"/>
-	   <topic href="html/tasks/breakpoints/pgm_bp_clearing.htm" label="Removing"/>
-	   <topic href="html/tasks/breakpoints/save_breakpoints_view.htm" label="Saving Contents of Breakpoints View"/>
-	   <topic href="html/tasks/breakpoints/pgm_bp_setting.htm" label="Setting"/>
-	   <topic href="html/tasks/breakpoints/pgm_bp_conditional.htm" label="Setting Conditional Breakpoints or Watchpoints"/>
-	   <topic href="html/tasks/breakpoints/show_breakpoints_view.htm" label="Show list of Breakpoints"/>
-	   <topic href="html/tasks/breakpoints/pgm_bp_temporary.htm" label="Temporary Breakpoints"/>
-	   <topic href="html/tasks/breakpoints/pgm_bp_view_props.htm" label="Viewing Properties"/>
+	   <topic href="html/debugger/breakpoints/breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/conditional_breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/exporting_breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/importing_breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/properties_breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/resolving_breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/temporary_breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/toggling_breakpoints.htm"/>
+	   <topic href="html/debugger/breakpoints/viewing_breakpoints.htm"/>
 	</entry>
 
 	<!--
@@ -272,9 +270,9 @@
 	</entry>
 
 	<entry keyword="Expressions">
-	   <topic href="html/tasks/expressions/expr_adding.htm" label="Adding"/>
-	   <topic href="html/tasks/expressions/expr_editing.htm" label="Editing"/>
-	   <topic href="html/tasks/expressions/expr_removing.htm" label="Removing"/>
+	   <topic href="html/debugger/variables/adding_expressions.htm" />
+	   <topic href="html/debugger/variables/editing_expressions.htm" />
+	   <topic href="html/debugger/variables/viewing_expressions.htm" />
 	</entry>
 
 	<entry keyword="Expressions view">
@@ -711,9 +709,9 @@
 
 	<entry keyword="variables">
 	   <topic href="html/concepts/working_with_variables.htm" />
-	   <topic href="html/tasks/variables/set_variable_formats.htm" />
-	   <topic href="html/tasks/variables/show_global_variables.htm" />
-	   <topic href="html/tasks/variables/show_variables_view.htm" />
+	   <topic href="html/debugger/variables/adding_variables.htm" />
+	   <topic href="html/debugger/variables/viewing_variables.htm" />
+	   <topic href="html/debugger/variables/variables.htm" />
 	</entry>
 
 	<entry keyword="Variables view">
@@ -746,13 +744,10 @@
 <!-- W -->
 
 	<entry keyword="watchpoints">
-	   <topic label="Watchpoints" href="html/tasks/watchpoints/pgm_watchpoints.htm" />
-	   <topic href="html/tasks/watchpoints/pgm_wpt_clearing.htm" />
-	   <topic href="html/tasks/watchpoints/pgm_wpt_conditional.htm" />
-	   <topic href="html/tasks/watchpoints/pgm_wpt_disable.htm" />
-	   <topic href="html/tasks/watchpoints/pgm_wpt_enable.htm" />
-	   <topic href="html/tasks/watchpoints/pgm_wpt_setting.htm" />
-	   <topic href="html/tasks/watchpoints/pgm_wpt_view_props.htm" />
+	   <topic href="html/debugger/watchpoints/watchpoints.htm" />
+	   <topic href="html/debugger/watchpoints/setting_watchpoints.htm" />
+	   <topic href="html/debugger/watchpoints/status_watchpoints.htm" />
+	   <topic href="html/debugger/watchpoints/toggling_watchpoints.htm" />
 	</entry>
 
     <entry keyword="workspaces">