Bug 191117 - Patch for Frank - update the Debug View page.

doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_view.htm

@@ -14,97 +14,333 @@
 
 <h1>Debug view</h1>
 
-<p>The <b>Debug</b> view shows the target information in a tree hierarchy  shown 
-below with a sample of the possible icons:</p>
-<table width="602" border="1">
-  <tr>
-    <th width="129">Session item </th>
-    <th width="352">Description </th>
-    <th width="99">Icons</th>
-  </tr>
-  <tr>
-    <td width="129">Launch instance </td>
-    <td width="352">Launch configuration name and launch type </td>
-    <td width="99"><img alt="Icon: Debug executable" src="../images/icon_debug_exc.gif" width="16" height="16">
-    <img alt="Icon: Run executable" src="../images/icon_run_exc.gif" width="16" height="16"> </td>
-  </tr>
-  <tr>
-    <td width="129">Debugger instance </td>
-    <td width="352">Debugger name and state</td>
-    <td width="99"><img alt="Icon: Debugger" src="../images/icon_debugt_obj.gif" width="16" height="16"> </td>
-  </tr>
-  <tr>
-    <td width="129">Thread instance </td>
-    <td width="352">Thread number and state</td>
-    <td width="99"><img alt="Icon: Thread; suspended" src="../images/icon_thread1.gif" width="16" height="16">
-    <img alt="Icon: Thread; running" src="../images/icon_thread2.gif" width="16" height="16">
-    <img alt="Icon: Thread; stopped" src="../images/icon_thread3.gif" width="16" height="16"> </td>
-  </tr>
-  <tr>
-    <td width="129">Stack frame instance </td>
-    <td width="352">Stack frame number, function, file name, and file line number </td>
-    <td width="99"><img alt="Icon: Stackframe" src="../images/icon_stackframe.gif" width="16" height="16">
-    <img alt="Icon: Stack frame; running" src="../images/icon_stackframe_running.gif" width="16" height="16"></td>
-  </tr>
-</table>
+<p>The <b>Debug</b> view shows the target debugging information in a tree hierarchy.</p>
+<p><img src="../images/view_debug.png" width="529" height="252" alt="Debug view" ></p>
 <p>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>
-
+  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>The  icons that appear in the Debug view include:</p>
+<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#999999" width="600">
+  <tr>
+    <th width="76" valign="top"><center>
+      Icons
+    </center></th>
+    <th width="169" valign="top">Session item </th>
+    <th width="317" valign="top">Description </th>
+  </tr>
+  <tr>
+    <td width="76" valign="top"><center>
+      <img src="../images/icon_db_launch_instance.png" width="19" height="16">
+    </center>    </td>
+    <td width="169" valign="top">Launch instance </td>
+    <td width="317" valign="top">Launch configuration name and launch type </td>
+  </tr>
+  <tr>
+    <td width="76" valign="top"><center>
+      <img alt="Icon: Debugger" src="../images/icon_debugt_obj.gif" width="16" height="16"> 
+      &nbsp;<img src="../images/icon_db_debug.png" width="16" height="17">
+    </center>    </td>
+    <td width="169" valign="top">Debugger instance </td>
+    <td width="317" valign="top">Debugger name and state</td>
+  </tr>
+  <tr>
+    <td width="76" valign="top"><center>
+      <img alt="Icon: Thread; suspended" src="../images/icon_thread1.gif" width="16" height="16">      &nbsp;<img alt="Icon: Thread; running" src="../images/icon_thread2.gif" width="16" height="16"> &nbsp;<img alt="Icon: Thread; stopped" src="../images/icon_thread3.gif" width="16" height="16"> 
+    </center>    </td>
+    <td width="169" valign="top">Thread instance </td>
+    <td width="317" valign="top">Thread number and state</td>
+  </tr>
+  <tr>
+    <td width="76" valign="top"><center>
+      <img src="../images/icon_db_stack_frame.png" width="16" height="15">
+    </center>    </td>
+    <td width="169" valign="top">Stack frame instance </td>
+    <td width="317" valign="top">Stack frame number, function, file name, and file line number </td>
+  </tr>
+</table>
 <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.</p>
 
-<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" width="561">
+<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#999999" width="600">
   <tr>
+    <th width="45" align="left"><center>
+      Icons
+    </center></th>
     <th align="left" valign="bottom" width="211">Action</th>
-    <th align="left" width="45">Icon</th>
     <th align="left" width="638">Description</th>
   </tr>
   <tr>
-    <td align="left" width="211">Terminate </td>
-    <td align="left" width="45">
-    <img border="0" src="../images/icon_terminate.gif" width="16" height="16"></td>
-    <td align="left" width="638">Ends the selected debug session and/or process. The impact of this action depends on the type of the item selected in the Debug view.</td>
+    <td align="left" valign="top">      <center>
+        <img src="../images/icon_db_terminate_all.png" width="21" height="20">
+        </center>    </td>
+    <td align="left" valign="top"><b>Remove All Terminated Launches </b></td>
+    <td align="left" valign="top">Clears all terminated processes in Debug view</td>
   </tr>
   <tr>
-    <td align="left" width="211">Disconnect</td>
-    <td align="left" width="45">
-    <img border="0" src="../images/icon_disconnect.gif" width="16" height="16"></td>
-    <td align="left" width="638">Detaches the debugger from the selected process (useful for 
-debugging attached processes)</td>
+    <td align="left" valign="top">      <center>
+        <img src="../images/icon_db_restart.png" width="20" height="18">
+        </center>    </td>
+    <td align="left" valign="top"><b>Restart</b></td>
+    <td align="left" valign="top">Starts a new debug session for the selected process</td>
   </tr>
   <tr>
-    <td align="left" width="211">Remove All Terminated</td>
-    <td align="left" width="45">
-    <img border="0" src="../images/icon_remove_all.gif" width="16" height="16"></td>
-    <td align="left" width="638">Clears all terminated processes in Debug view</td>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_resume.png" width="19" height="14">
+    </center>    </td>
+    <td align="left" valign="top"><b>Resume</b></td>
+    <td align="left" valign="top">Select the Resume command to resume  execution of the currently suspended debug target.</td>
   </tr>
   <tr>
-    <td align="left" width="211">Terminate and Remove</td>
-    <td align="left" width="45">
-    <img border="0" src="../images/icon_terminate_rem.gif" width="16" height="16"></td>
-    <td align="left" width="638">Ends the selected debug session and removes it from Debug 
-    view</td>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_suspend.png" width="17" height="17">
+    </center>    </td>
+    <td align="left" valign="top"><b>Suspend</b></td>
+    <td align="left" valign="top">Select the Suspend command to halt  execution of the currently selected thread in a debug target.</td>
   </tr>
   <tr>
-    <td align="left" width="211">Relaunch</td>
-    <td align="left" width="45">
-    <img border="0" src="../images/icon_relaunch.gif" width="16" height="16"></td>
-    <td align="left" width="638">Starts a new debug session for the selected process</td>
+    <td width="45" align="left" valign="top">      <center>
+        <img src="../images/icon_db_terminate.png" width="17" height="15">
+        </center>    </td>
+    <td width="211" align="left" valign="top"><b>Terminate </b></td>
+    <td width="638" align="left" valign="top">Ends the selected debug session and/or process. The impact of this action depends on the type of the item selected in the Debug view.</td>
   </tr>
   <tr>
-    <td align="left" width="211">Terminate All</td>
-    <td align="left" width="45">
-    <img border="0" src="../images/icon_terminate_all.gif" width="16" height="16"></td>
-    <td align="left" width="638">Ends all active debug sessions in Debug view</td>
+    <td width="45" align="left" valign="top">      <center>
+        <img border="0" src="../images/icon_disconnect.gif" width="16" height="16">
+        </center>    </td>
+    <td width="211" align="left" valign="top"><b>Disconnect</b></td>
+    <td width="638" align="left" valign="top">Detaches the debugger from the selected process (useful for 
+debugging attached processes).</td>
+  </tr>
+  <tr>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_stepinto.png" width="18" height="14">
+    </center>    </td>
+    <td align="left" valign="top"><b>Step Into </b></td>
+    <td>Select  to execute the current line, including any routines, and proceed to the next statement.</td>
+  </tr>
+  <tr>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_stepover.png" width="19" height="14">
+    </center>    </td>
+    <td align="left" valign="top"><b>Step Over </b></td>
+    <td>Select to execute the current line, following execution inside a routine.</td>
+  </tr>
+  <tr>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_stepreturn.png" width="17" height="14">
+    </center>    </td>
+    <td align="left" valign="top"><b>Step Return </b></td>
+    <td>Select to continue execution to the end of the current routine, then follow execution to the routine&rsquo;s caller.</td>
+  </tr>
+  <tr>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_drop_to_frame.png" width="18" height="17">
+    </center>    </td>
+    <td align="left" valign="top"><b>Drop to Frame </b></td>
+    <td align="left" valign="top">Select the Drop to Frame command to re-enter the selected stack frame in the Debug view.</td>
+  </tr>
+  <tr>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_step_mode.png" width="19" height="14">
+    </center>    </td>
+    <td align="left" valign="top"><b>Instruction Stepping Mode </b></td>
+    <td align="left" valign="top">Activate to enable instruction stepping mode to examine a program as it steps into disassembled code. </td>
+  </tr>
+  <tr>
+    <td align="left" valign="top"><center>
+      <img src="../images/icon_db_use_step_filters.png" width="18" height="17">
+    </center>    </td>
+    <td align="left" valign="top"><b>Use Step Filters </b></td>
+    <td align="left" valign="top">Select the Use Step Filters command to change whether step filters should be used in the Debug view.</td>
+  </tr>
+  <tr>
+    <td align="left" valign="top"><center>
+    </center>    </td>
+    <td align="left" valign="top"><b>Menu</b></td>
+    <td align="left" valign="top"><p>Use the Debug view menu to:</p>
+      <ul>
+        <li>alternate showing of full or no paths on source files</li>
+        <li>control how views are managed</li>
+        <li>activate or deactivate the child elements shown in the Debug view </li>
+    </ul></td>
   </tr>
 </table>
 
+<h3>Debug view context menu commands </h3>
+<dl>
+  <p>The Debug view context menu commands   include:</p>
+  <table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#999999" width="600">
+    <tr>
+      <td align="center"><b>Icons</b></td>
+      <td align="center"><b>Name</b></td>
+      <td align="center"><b>Description</b></td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_db_copy_stack.png" width="20" height="19">
+      </center>      </td>
+      <td><b>Copy Stack </b></td>
+      <td>Copies the selected stack of suspended threads as well as the state of the running threads to the clipboard. </td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+      </center>      </td>
+      <td><b>Find...</b></td>
+      <td>Opens the debug view element searching dialog.</td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_db_drop_to_frame.png" width="18" height="17">
+      </center>      </td>
+      <td><b>Drop To Frame </b></td>
+      <td>Select the Drop to Frame command to re-enter the selected stack frame in the Debug view.</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_restart.png" width="20" height="18">
+              </center>      </td>
+      <td align="left" valign="top"><b>Restart</b></td>
+      <td align="left" valign="top">Starts a new debug session for the selected process</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_stepinto.png" width="18" height="14">
+              </center>      </td>
+      <td align="left" valign="top"><b>Step Into </b></td>
+      <td>Select  to execute the current line, including any routines, and proceed to the next statement.</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_stepover.png" width="19" height="14">
+              </center>      </td>
+      <td align="left" valign="top"><b>Step Over </b></td>
+      <td>Select to execute the current line, following execution inside a routine.</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_stepreturn.png" width="17" height="14">
+              </center>      </td>
+      <td align="left" valign="top"><b>Step Return </b></td>
+      <td>Select to continue execution to the end of the current routine, then follow execution to the routine&rsquo;s caller.</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">        <center>
+          <img src="../images/icon_db_step_mode.png" width="19" height="14">
+        </center>      </td>
+      <td align="left" valign="top"><b>Instruction Stepping Mode </b></td>
+      <td align="left" valign="top">Activate to enable instruction stepping mode to examine a program as it steps into disassembled code. </td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">        <center>
+        <img src="../images/icon_db_use_step_filters.png" width="18" height="17">
+      </center>      </td>
+      <td align="left" valign="top"><b>Use Step Filters </b></td>
+      <td align="left" valign="top">Toggles step filters on/off. When on, all step functions apply step filters.</td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_resume_signal.png" width="17" height="15">
+      </center>      </td>
+      <td><b>Resume Without Signal </b></td>
+      <td valign="top">Resume program execution after receiving the signal. </td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_resume.png" width="19" height="14">
+              </center>      </td>
+      <td align="left" valign="top"><b>Resume</b></td>
+      <td align="left" valign="top">Select the Resume command to resume  execution of the currently suspended debug target.</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_suspend.png" width="17" height="17">
+              </center>      </td>
+      <td align="left" valign="top"><b>Suspend</b></td>
+      <td align="left" valign="top">Select the Suspend command to halt  execution of the currently selected thread in a debug target.</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_terminate.png" width="17" height="15">
+              </center>      </td>
+      <td align="left" valign="top"><b>Terminate </b></td>
+      <td align="left" valign="top">Ends the selected debug session and/or process. The impact of this action depends on the type of the item selected in the Debug view.</td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_db_terminate_relaunch.png" width="19" height="17">
+      </center>      </td>
+      <td><b>Terminate and Relaunch </b></td>
+      <td>Select the Terminate and Relaunch command to  terminate the selected debug target and then relaunch it.</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img border="0" src="../images/icon_disconnect.gif" width="16" height="16">
+              </center>      </td>
+      <td align="left" valign="top"><b>Disconnect</b></td>
+      <td align="left" valign="top">Detaches the debugger from the selected process (useful for 
+        debugging attached processes)</td>
+    </tr>
+    <tr>
+      <td align="left" valign="top">          <center>
+          <img src="../images/icon_db_terminate_all.png" width="21" height="20">
+              </center>      </td>
+      <td align="left" valign="top"><b>Remove All Terminated </b></td>
+      <td align="left" valign="top">Clears all terminated processes in Debug view</td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_db_relaunch.png" width="21" height="19">
+      </center>      </td>
+      <td><b>Relaunch</b></td>
+      <td>This command relaunches the selected debug target. </td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+      </center>      </td>
+      <td><b>Edit...</b></td>
+      <td>Opens the launch configuration dialog, allowing you to make changes. </td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_db_edit_src_lookup.png" width="20" height="18">
+      </center>      </td>
+      <td><b>Edit Source Lookup... </b></td>
+      <td valign="top">Opens the source lookup dialog, allowing you to make changes. </td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+      </center>      </td>
+      <td><b>Lookup Source </b></td>
+      <td>Select  to force a source lookup to take place. </td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_db_terminate_remove.png" width="19" height="17">
+      </center>      </td>
+      <td><b>Terminate and Remove </b></td>
+      <td>Terminates the selected debug target and removes it from the view. </td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+        <img src="../images/icon_db_terminate_all2.png" width="19" height="18">
+      </center>      </td>
+      <td><b>Terminate All </b></td>
+      <td>Terminates all active launches in the view. </td>
+    </tr>
+    <tr>
+      <td align="left"><center>
+      </center>      </td>
+      <td><b>Properties</b></td>
+      <td>Opens the <b>Properties for</b> window showing the process properties. </td>
+    </tr>
+  </table>
+</dl>
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
 <br>
 <a href="../concepts/cdt_c_over_dbg.htm">Debug overview</a><br>
@@ -116,6 +352,7 @@ debugging attached processes)</td>
 <br>
 <a href="cdt_o_run_dbg_pages.htm">Run and Debug dialog box</a></p>
 
+<img src="../images/nokia2007Copyright.png" alt="Nokia Copyright Statement"><br>
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
 
 </body>

doc/org.eclipse.cdt.doc.user/topics_Reference.xml

@@ -18,7 +18,7 @@
 		<topic label="Properties view" href="reference/cdt_u_properties_view.htm"/>
 		<topic label="Search view" href="reference/cdt_u_search_view.htm"/>
 		<topic label="Call Hierarchy view" href="reference/cdt_u_call_hierarchy_view.htm"/>
-		<topic label="Debug view" href="reference/cdt_o_dbg_view.htm">
+		<topic label="Debug views" href="reference/cdt_o_dbg_view.htm">
 			<topic label="Registers view" href="reference/cdt_u_registersview.htm"/>
 			<topic label="Memory view" href="reference/cdt_u_memoryview.htm"/>
 			<topic label="Memory view preferences" href="reference/cdt_u_mem_view_pref.htm"/>