Updated workbench page and related inked pages to match CDT 7.0.

3 files changed, 48 insertions, 54 deletions

diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm
index e1a0cbf16ec..035345c47da 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_perspectives.htm
@@ -16,7 +16,7 @@ Each type of perspective is a combination of views, menus, and toolbars that ena
 For example, the C/C++ perspective has views that are organized to help you develop C/C++ programs; 
 the <strong>Debug</strong> perspective has views that enable you to debug those programs.
 </p>
-<p>To Open the C/C++ Perspective, select Window > Open Perspective > Other...  and select C/C++</p>
+<p>To Open the C/C++ perspective, select <strong>Window > Open Perspective > Other...</strong>  and select <strong>C/C++</strong>.</p>
 
 
 <div class="note">
@@ -36,34 +36,33 @@ the <strong>Debug</strong> perspective has views that enable you to debug those
 By default it consists of an editor area and the following views:
 </p>
 <ul>
-<li>Project Explorer</li>
-<li>Console</li>
-<li>Properties</li>
-<li>Problems</li>
+<li><a href="../reference/cdt_u_cproj_view.htm">Project Explorer</a></li>
+<li><a href="../reference/cdt_u_console_view.htm">Console</a></li>
+<li><a href="../reference/cdt_u_properties.htm">Properties</a></li>
+<li><a href="../reference/cdt_u_problems_view.htm">Problems</a></li>
+<li><a href="../reference/cdt_u_make_targets_view.htm">Make Targets</a></li>
+<li><a href="../reference/cdt_u_outline_view.htm">Outline</a></li>
 <li>Tasks</li>
-<li>Make Targets</li>
-<li>Outline</li>
-<li>Search</li>
 </ul>
 
+<p>There a several additional views that may be useful during a debug session. You can add them by clicking <strong>Window &gt; Show View &gt; C/C++</strong> to show them in the C/C++ perspective.</p>
 <h3>Debug perspective views</h3>
 
 <p>This perspective is tuned for debugging your C/C++ program. 
 By default it includes an editor area and the following views:
 </p>
 <ul>
-<li>Debug</li>
+<li><a href="../reference/cdt_u_dbg_view.htm">Debug</a></li>
 <li>Variables</li>
 <li>Breakpoints</li>
-<li>Expressions</li>
-<li>Registers</li>
-<li>Memory</li>
-<li>Display (for use with JDT only)</li>
-<li>Outline</li>
-<li>Console</li>
+<li><a href="../reference/cdt_u_outline_view.htm">Outline</a></li>
+<li><a href="../reference/cdt_u_console_view.htm">Console</a></li>
 <li>Tasks</li>
+<li><a href="../reference/cdt_u_problems_view.htm">Problems</a></li>
+<li><a href="../reference/cdt_u_view_executables.htm">Executables</a></li>
 </ul>
 
+<p>There a several additional views that may be useful during a debug session. You can add them by clicking <strong>Window &gt; Show View &gt; Debug</strong> to show them in the Debug perspective.</p>
 <h3>Other Perspectives</h3>
 
 <p>In addition to the perspectives named above and the
@@ -78,18 +77,9 @@ Eclipse also has perspectives that are tuned to other types of development:
 </ul>
 
 
- <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
-<br><a href="cdt_c_views.htm">Views in the C/C++ perspective</a>
-<br><a href="cdt_o_dbg_concepts.htm">Debug Concepts</a>
-</p>
-
-<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
-<br><a href="../tasks/cdt_t_add_brkpnts.htm">Adding breakpoints</a>
-</p>
-
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
-<br><a href="../reference/cdt_u_console_view.htm">Console view</a>
-</p>
+<br>
+<a href="../reference/cdt_o_views.htm">C/C++ Views and Editors</a></p>
 
 <p>
 <img src="../images/rh03_04.gif" ALT="Red Hat Copyright Statement"><br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_views.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_views.htm
index 0ac56785f73..934a97001c6 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_views.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_views.htm
@@ -12,11 +12,11 @@
 <h1>Views in the C/C++ perspective</h1>
 
 <p>The C/C++ views are panels that help you perform the tasks involved in creating C/C++ programs.
-The <strong>C/C++</strong> perspective displays these panels in a single Eclipse window. </p>
+The <a href="cdt_c_perspectives.htm">C/C++ perspective</a> displays these panels in a single Eclipse window. </p>
 
 <strong>Changing Views:</strong> 
 <ul>
-	<li>You can add views to a perspective. From the menu bar choose  <strong>Window > Show View > Other</strong> and select a new view from the <strong>Show View</strong> dialog.</li>
+	<li>You can add views to a perspective. From the menu bar choose  <strong>Window > Show View > Other</strong> and select a new view from the Show View dialog.</li>
 	<li>To reset the current perspective to its original layout, from the menu bar choose  <strong>Window > Reset Perspective</strong>.</li>
 </ul>
 
@@ -24,15 +24,14 @@ The <strong>C/C++</strong> perspective displays these panels in a single Eclipse
 
 <dl>
 	<dt>Project Explorer</dt><dd>Shows all of the file system's files under your workspace directory.</dd>
-	<dt>C/C++ Projects</dt><dd>Displays, in a tree structure, only elements relevant to C and C++ projects.</dd>
 	<dt>Console</dt><dd>Displays your program's output, as well as the output from your build tools.</dd>
 	<dt>Editor</dt><dd>The C/C++ editor view provides specialized features for editing C/C++ related files.</dd>
 	<dt>Make Targets</dt><dd>Enables you to select the make targets you want to build in your workspace.</dd>
 	<dt>Outline</dt><dd>Displays the structure of the file currently open in an editor.</dd>
-	<dt>Problems View</dt><dd>If you encounter any errors during a build they will be displayed in the Problems view.</dd>
+	<dt>Problems</dt>
+	<dd>If you encounter any errors during a build they will be displayed in the Problems view.</dd>
 	<dt>Properties</dt><dd>Shows the attributes of the item currently selected in a view or an editor.</dd>
-	<dt>Search</dt><dd>Shows the results of searches for files or text.</dd>
-	<dt>Tasks</dt>	<dd>Lists tasks that want to keep track of, either as a schedule of things 	to do or a history of things that have been done.</dd>
+	<dt>Tasks</dt><dd>Lists tasks that want to keep track of, either as a schedule of things 	to do or a history of things that have been done.</dd>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm
index d487aad466e..da014ed8886 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm
@@ -29,29 +29,34 @@ To reset the current perspective to its original layout, from the menu bar selec
 </li>
 </ul>
 
-<h2>Setting the operation and appearance of the C/C++ Editor</h2>
-
-<ol>
-<br><li>To open the Workbench preferences, from the menu bar, select <strong>Window &gt; Preferences</strong>.</li>
-<br><li>Expand <strong>C/C++</strong> and select <strong>Editor</strong>. 
-
-<p><br><a href="javascript:void(0)" onClick="newWin('../images/editor_general_preferences.png')">Click here to see an illustration (displayed in a separate window).</a></p></li>
-<br><li>Make any changes that you require to be comfortable editing files. 
-For example, you might want to enable <strong>Show line numbers</strong> or change the <strong>Problem indicator color</strong> to a different shade of red. For more information about setting preferences in the editor, see <a href="../reference/cdt_u_c_editor_gen.htm">General page Preferences window</a> in the reference section.</li>
-
-<br><li>On the Preferences C/C++ Editor dialog, click the <strong>Colors</strong> tab. The <strong>Colors</strong> tab for the C/C++ Editor preferences dialog displays.</p><p><br><a href="javascript:void(0)" onClick="newWin('../images/editor_color_preferences.png')">Click here to see an illustration.</a></p>
-
-<br>Again, make any changes that will be useful for your working habits and click <strong>OK</strong>. For more information see the <a href="../reference/cdt_u_c_editor_color.htm">Color page Preferences window</a> in the reference section.</li>
-
-<br><li>On the <strong>Preferences C/C++ Editor</strong> dialog, click the <strong>Content Assist</strong> tab. The <strong>Preferences C/C++ Editor</strong> dialog's <strong>Content Assist</strong> tab appears.<br>
-<p><br><a href="javascript:void(0)" onClick="newWin('../images/contentAssist_preferences.png')">Click here to see an illustration.</a></p>
-
-
-<p><br>If you want to set an auto-activation delay or change the background for completion proposals, do so now. For more information see the <a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist page Preferences window</a> in the reference section.</p></li>
-<br><li>Leave the preferences by clicking <strong>OK</strong>.</li>
-</ol>
-
+<h2>Setting the global editor operations and appearance</h2>
 
+<ul>
+    <li>Click <strong>Window &gt; Preferences &gt; General &gt; Editors</strong> to access global editor related preference panels, including.
+        <ul>
+            <li>File Associations</li>
+            <li>Structured Text Editor</li>
+            <li>Text Editors</li>
+        </ul>
+    </li>
+</ul>
+<h2>Setting the C/C++ editor operations and appearance</h2>
+<ul>
+    <li>Click <strong>Window &gt; Preferences &gt; C/C++ &gt; Editor </strong>to access C/C++ editor preference panels, inlcuding:
+        <ul>
+            <li><a href="../reference/cdt_u_c_editor_gen.htm">Editor</a> – control the appearance of text highlighting</li>
+            <li><a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist </a>— customize the Content Assist feature</li>
+            <li><a href="../reference/cdt_u_c_editor_folding.htm">Folding</a> — customize  folding behavior in the C/C++ editor</li>
+            <li><a href="../reference/cdt_u_c_editor_hov.htm">Hovering</a> — customize  hover behavior in the C/C++ editor </li>
+            <li><a href="../reference/cdt_u_c_editor_mark_occurrences.htm">Mark Occurances</a> — set annotations for the C/C++ Editor view</li>
+            <li><a href="../reference/cdt_u_c_editor_save_actions.htm">Save Actions</a> — configure actions performed while saving a file</li>
+            <li><a href="../reference/cdt_u_c_editor_scalability.htm">Scalability</a> — configure behavior for handling large source files</li>
+            <li><a href="../reference/cdt_u_c_editor_color.htm">Syntax Coloring</a> — specify how C/C++ source code is rendered</li>
+            <li><a href="../reference/cdt_u_c_code_templates_pref.htm">Templates</a> — configure the format of newly generated code stubs, comments and files</li>
+            <li><a href="../reference/cdt_u_c_editor_typing.htm">Typing</a> — configure formatting input as you type</li>
+        </ul>
+    </li>
+</ul>
 <p><img src="../images/ngref.gif" alt="Related reference">
 <br><a href="../reference/cdt_o_ceditor_pref.htm">C/C++ Editor Preferences</a></p>