diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
index 22657e4569d..ac5ef4a5717 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -535,4 +535,7 @@
    <description>The Project Explorer displays project information.</description>
    <topic href="reference/cdt_u_project_explorer_view.htm" label="Project Explorer view"/>
 </context>
+<context id="content_outline_context" title="Outline">
+   <topic href="reference/cdt_u_outline_view.htm" label="Outline view"/>
+</context>
 </contexts>
diff --git a/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png b/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png
index eb1872004ed..95c06202b23 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png and b/doc/org.eclipse.cdt.doc.user/images/create_make_target_win.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/icon_build_make_target.png b/doc/org.eclipse.cdt.doc.user/images/icon_build_make_target.png
new file mode 100755
index 00000000000..acc6050601d
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/icon_build_make_target.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/icon_edit_make_target.png b/doc/org.eclipse.cdt.doc.user/images/icon_edit_make_target.png
new file mode 100755
index 00000000000..6107ff02908
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/icon_edit_make_target.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/icon_hide_make_targets.png b/doc/org.eclipse.cdt.doc.user/images/icon_hide_make_targets.png
new file mode 100755
index 00000000000..41c10268273
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/icon_hide_make_targets.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/icon_new_make_target.png b/doc/org.eclipse.cdt.doc.user/images/icon_new_make_target.png
new file mode 100755
index 00000000000..e813698f13a
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/icon_new_make_target.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png b/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png
index b2d10592fc4..6526578b7ec 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png and b/doc/org.eclipse.cdt.doc.user/images/view_make_targets.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm
index 55b8d3da29a..84e58c91d2f 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_make_targets_view.htm
@@ -6,44 +6,74 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Make Targets view</title>
 <link rel="stylesheet" type="text/css" href="../help.css">
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body>
 
 <h1>Make Targets view</h1>
 
-<p>Enables you to select the make targets you want to build in your workspace.</p>
+<p>Use the <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.cdt.make.ui.views.MakeView)")'>Make Targets</a> view to select the make targets you want to build in your workspace.</p>
 
 <p><img src="../images/view_make_targets.png" alt="Make Targets View"></p>
 
-<p><table border="1" cellpadding="1" cellspacing="0">
+<h2>Make Target toolbar</h2>
+<p>The table below lists the toolbar options displayed in the Make Targets view.</p>
+
+<p><table border="1" cellpadding="4" cellspacing="0" bordercolor="#DDDDDD" width="600" >
+	<colgroup>
+		<col width="10%" valign="top" >
+		<col width="30%" valign="top" >
+		<col width="60%" valign="top" >
+	</colgroup>
 	<tr>
-		<th>Icon</th>
+		<th align="center" >Icon</th>
 		<th>Command</th>
 		<th>Description</th>
 	</tr>
 	<tr>
-		<td><img src="../images/icon_home.png" alt="Home icon"></td>
+		<td align="center"><img src="../images/icon_new_make_target.png" alt="Home icon"></td>
+		<td>New Make Target</td>
+		<td>Opens the <b>Create Make Target</b> dialog box to define a new make target.</td>
+	</tr>
+	<tr>
+		<td align="center"><img src="../images/icon_edit_make_target.png" alt="Home icon"></td>
+		<td>Edit Make Target</td>
+		<td>Edits currently selected target in the <b>Modify Make Target</b> dialog box.</td>
+	</tr>
+	<tr>
+		<td align="center"><img src="../images/icon_build_make_target.png" alt="Home icon"></td>
+		<td>Build Make Target</td>
+		<td>Builds currently selected target.</td>
+	</tr>
+	<tr>
+		<td align="center"><img src="../images/icon_home.png" alt="Home icon"></td>
 		<td>Home</td>
 		<td>Move to the top level.</td>
 	</tr>
 	<tr>
-		<td><img src="../images/icon_back.png" alt="Back icon"></td>
+		<td align="center"><img src="../images/icon_back.png" alt="Back icon"></td>
 		<td>Back</td>
 		<td>Navigates back to a previous level.</td>
 	</tr>
 	<tr>
-		<td><img src="../images/icon_forward.png" alt="Forward icon"></td>
+		<td align="center"><img src="../images/icon_forward.png" alt="Forward icon"></td>
 		<td>Forward</td>
 		<td>Navigates forward to the next level.</td>
 	</tr>
 	<tr>
-		<td><img src="../images/icon_build_target.png" alt="Build Target icon"></td>
-		<td>Build Target</td>
-		<td>Builds currently selected target.</td>
+		<td align="center"><img src="../images/icon_hide_make_targets.png" alt="Forward icon"></td>
+		<td>Hide Empty Folders</td>
+		<td>Toggles the display of empty folders in the Make Targets view.</td>
 	</tr>
 </table></p>
 
 
+<p><img src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
+<br><a href="../tasks/cdt_t_addmaketarget.htm">Creating a Make Target</a></p>
+
+<p><img src="../images/ngref.gif" ALT="Related references" width="143" height="21">
+<br><a href="../reference/cdt_o_views.htm">Views</a></p>
+<hr />
 <p>
 <img src="../images/rh03_04.gif" ALT="Red Hat Copyright Statement"> <br>
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >  
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm
index 360d11ab897..f20a10c4b6b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_navigator_view.htm
@@ -6,16 +6,22 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 	<title>Navigator view</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+	<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 
 <body>
 <h1>Navigator view</h1>
-<p>This view provides a hierarchical view of the resources in the Workbench.</p>
+<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.ResourceNavigator)")'>Navigator</a> view provides a hierarchical view of the resources in the Workbench including hidden files.</p>
 <p><img src="../images/view_navigator.png" alt="Navigator View"></p>
 
 <h2>Toolbar</h2>
 
-<p><table border="1" cellpadding="3" cellspacing="0">
+<p><table border="1" cellpadding="4" cellspacing="0" width="600px" bordercolor="#DDDDDD">
+	<colgroup>
+		<col width="5%" valign="top" >
+		<col width="20%" valign="top" >
+		<col width="75%" valign="top" >
+	</colgroup>
  	<tr>
 		<th>Icon</th>
 		<th>Name</th>	
@@ -90,6 +96,9 @@
 
 <p>In addition to these menu items, the Navigator view menu shows a list of recently used working sets that have been selected in the view.</p>
 
+<p><img src="../images/ngref.gif" ALT="Related references" width="143" height="21">
+<br><a href="../reference/cdt_o_views.htm">C/C++ Views and Editors</a></p>
+<hr />
 
 <p><img src="../images/ng00_07.gif" ALT=" IBM Copyright Statement" ></p>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
index 1c0ff3fa9f9..f46e3eec791 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_outline_view.htm
@@ -6,12 +6,13 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Outline view</title>
 <link rel="stylesheet" type="text/css" href="../help.css">
+<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 </head>
 <body>
 
 <h1>Outline view</h1>
 
-<p>The Outline view displays an outline of a structured C/C++ file that is currently 
+<p>The <img src="../images/command_link.png" border="0" alt="" /> <a class="command-link" href='javascript:executeCommand("org.eclipse.ui.views.showView(org.eclipse.ui.views.showView.viewId=org.eclipse.ui.views.ContentOutline)")'>Outline</a> view displays an outline of a structured C/C++ file that is currently 
 open in the editor area, by listing the structural elements. </p>
 
 <p><img src="../images/outlineView.png" alt="Outline View"></p>
@@ -21,25 +22,25 @@ open in the editor area, by listing the structural elements. </p>
 
 <p>The table below lists the icons displayed in the Outline view toolbar.</p>
 
-<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" width="34%">
+<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#DDDDDD" width="34%">
 <tr>
-  <td width="19%" align="left"><strong>Icon</strong></td>
+  <td width="19%" align="center"><strong>Icon</strong></td>
   <td width="81%"><strong>Description</strong></td>
 </tr>
 <tr>
-  <td><img border="0" src="../images/fields_co.gif" alt="Hide Fields Icon" width="16" height="16"></td>
+  <td align="center" ><img border="0" src="../images/fields_co.gif" alt="Hide Fields Icon" width="16" height="16"></td>
   <td>Hide Fields</td>
 </tr>
 <tr>
-  <td><img border="0" src="../images/static_co.gif" alt="Hide Static Members Icon" width="16" height="16"></td>
+  <td align="center" ><img border="0" src="../images/static_co.gif" alt="Hide Static Members Icon" width="16" height="16"></td>
   <td>Hide Static Members </td>
 </tr>
 <tr>
-  <td><img border="0" src="../images/public_co.gif" alt="Hide Non-Public Members Icon" width="16" height="16"></td>
+  <td align="center" ><img border="0" src="../images/public_co.gif" alt="Hide Non-Public Members Icon" width="16" height="16"></td>
   <td>Hide Non-Public Members </td>
 </tr>
 <tr>
-  <td><img border="0" src="../images/alphab_sort_co.gif" alt="Sort items alphabetically Icon" width="16" height="16"></td>
+  <td align="center" ><img border="0" src="../images/alphab_sort_co.gif" alt="Sort items alphabetically Icon" width="16" height="16"></td>
   <td>Sort items alphabetically</td>
 </tr>
 </dl>
@@ -49,93 +50,97 @@ open in the editor area, by listing the structural elements. </p>
 
 <p>The table below lists the icons displayed in the Outline view.</p>
 
-<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" width="34%">
+<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#DDDDDD" width="34%">
+	<colgroup>
+		<col width="25%" valign="top" >
+		<col width="75%" valign="top" >
+	</colgroup>
   <tr>
-    <td><strong>Icon</strong></td>
+    <td align="center" ><strong>Icon</strong></td>
     <td><strong>Description</strong></td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/class_obj.gif" width="16" height="16" alt="Class icon"></td>
     <td>Class</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/container_obj.gif" width="16" height="16" alt="Namespace icon"></td>
     <td>Namespace</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/define_obj.gif" width="16" height="16" alt="Macro Definition icon"></td>
     <td>Macro Definition</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/enum_obj.gif" width="16" height="16" alt="Enum icon"></td>
     <td>Enum</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/enumerator_obj.gif" width="16" height="16" alt="Enumerator icon"></td>
     <td>Enumerator</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/field_obj.gif" width="16" height="16" alt="Variable icon"></td>
     <td>Variable</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/field_private_obj.gif" width="16" height="16" alt="Field private icon"></td>
     <td>Field private</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/field_protected_obj.gif" width="16" height="16" alt="Field protected icon"></td>
     <td>Field protected</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/field_public_obj.gif" width="16" height="16" alt="Field public icon"></td>
     <td>Field public</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/include_obj.gif" width="16" height="16" alt="Include icon"></td>
     <td>Include</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/method_private_obj.gif" width="16" height="16" alt="Method private icon"></td>
     <td>Method private</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/method_protected_obj.gif" width="16" height="16" alt="Method protected icon"></td>
     <td>Method protected</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/method_public_obj.gif" width="16" height="16" alt="Method public icon"></td>
     <td>Method public</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/struct_obj.gif" width="16" height="16" alt="Struct icon"></td>
     <td>Struct</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/typedef_obj.gif" width="16" height="16"  alt="Type definition icon"></td>
     <td>Type definition</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/union_obj.gif" width="16" height="16" alt="Union icon"></td>
     <td>Union</td>
   </tr>
   <tr>
-    <td>
+    <td align="center" >
     <img src="../images/var_declaration_obj.gif" width="16" height="16" alt="Function icon"></td>
     <td>Function</td>
   </tr>
@@ -151,6 +156,7 @@ C/C++ Projects view</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="cdt_o_views.htm">Views</a></p>
+<hr />
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
index eeda34ba8ba..4b4936c215d 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
@@ -16,22 +16,23 @@
 <p>To create a make target:</p>
 <ol>
   <li>Right click on a project and select <strong>Make Target &gt; Create</strong>.</li>
-  <li>Enter the Target name and build options and click <strong>Create</strong>.<br>
-  <img src="../images/create_make_target_win.png"   alt="Create Make Target Window"><br>&nbsp;</li>
-  <li>The make target will appear in the Make Targets view.<br>
-  <img src="../images/view_make_targets.png"   alt="Make Targets View"><br>&nbsp;</li>
+  <li>Enter the Target name and build options then click <strong>Create</strong>.<br>
+  <img src="../images/create_make_target_win.png" alt="Create Make Target Window" vspace="10" ><br>&nbsp;</li>
+  <li>The make target appear in the <a href="../reference/cdt_u_make_targets_view.htm">Make Target</a> view.<br>
+  <img src="../images/view_make_targets.png"   alt="Make Targets View" vspace="10" ><br>&nbsp;</li>
 </ol>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
 <br>
 <a href="../concepts/cdt_c_build_over.htm">Build overview</a></p>
-<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21" >
 <br>
 <a href="cdt_t_proj_build_set.htm">Defining Project Build settings</a><br>
 <a href="cdt_o_build_task.htm">Building projects</a></p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
 <a href="../reference/cdt_u_create_make_target.htm">Create a Make Target</a><br>
 <a href="../reference/cdt_u_make_targets_view.htm">Make Target View</a></p>
+<hr />
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
 
 </body>

Icon	Command	Description
	New Make Target	Opens the Create Make Target dialog box to define a new make target.
Edit Make Target	Edits currently selected target in the Modify Make Target dialog box.
Build Make Target	Builds currently selected target.
Home	Move to the top level.
	Back	Navigates back to a previous level.
	Forward	Navigates forward to the next level.
Build Target	Builds currently selected target.		Hide Empty Folders	Toggles the display of empty folders in the Make Targets view.
Icon	Icon	Description
		Hide Fields
		Hide Static Members
		Hide Non-Public Members
		Sort items alphabetically