diff --git a/doc/org.eclipse.cdt.doc.user/images/icon_menu_white.png b/doc/org.eclipse.cdt.doc.user/images/icon_menu_white.png
new file mode 100644
index 00000000000..43bf94ae0c1
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/icon_menu_white.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/icon_pin_memory.png b/doc/org.eclipse.cdt.doc.user/images/icon_pin_memory.png
new file mode 100644
index 00000000000..4e061e0bcea
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/icon_pin_memory.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/nokia2007Copyright.png b/doc/org.eclipse.cdt.doc.user/images/nokia2007Copyright.png
index 2f43e48c602..9868dc19236 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/nokia2007Copyright.png and b/doc/org.eclipse.cdt.doc.user/images/nokia2007Copyright.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/view_debug_prefs.png b/doc/org.eclipse.cdt.doc.user/images/view_debug_prefs.png
new file mode 100644
index 00000000000..df849f3de2a
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/view_debug_prefs.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/view_registers.png b/doc/org.eclipse.cdt.doc.user/images/view_registers.png
new file mode 100644
index 00000000000..1554f0a8b99
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/view_registers.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm
index 31c80a31915..7f4bf6d807d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_call_hierarchy_view.htm
@@ -107,7 +107,7 @@
   <a href="../concepts/cdt_c_dbg_info.htm">Debug information</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>
-<img src="../images/nokia2007Copyright.png" ALT="Nokia Copyright Statement" width="180" height="19" > 
+<img src="../images/nokia2007Copyright.png" alt="Nokia Copyright Statement" > 
 </body>
 
 </html>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
index 7e0b1325211..233bdaf6ee5 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_brkpt_actions.htm
@@ -44,7 +44,7 @@
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
   <a href="cdt_u_debug.htm">Debug preferences</a></p>
 <hr>
-<img src="../images/nokia2007Copyright.png" ALT="Nokia Copyright Notice" >
+<img src="../images/nokia2007Copyright.png" alt="Nokia Copyright Statement" >
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
index bc24f7703fa..beb07524cf4 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dbg_pref.htm
@@ -12,8 +12,7 @@
 <h1>Debug preferences</h1>
 
 <p>The C/C++ <b>Debug</b> panel controls general settings for C/C++ debugging.</p>
-<img src="../images/view_debug_prefs.png" ALT="C/C++ Debug preferences panel" >
-
+<p><img src="../images/view_debug_prefs.png" ALT="C/C++ Debug preferences panel" ></p>
 <table width="600px" cellpadding="5" cellspacing="0" border="1" >
 	<caption><b>C/C++ Debug Preference Options</b></caption>
 	<colgroup>
@@ -45,6 +44,10 @@
 			<td width="30%" valign="top"><dt>Color of source lines</dt></td>
 			<td valign="top">The color of source lines in the Disassembly view if mixed source/disassembly code is shown.</td>
 		</tr>
+		<tr>
+		  <td valign="top"><b>Show source files in binaries </b></td>
+		  <td valign="top">Show source files associated with project binaries. </td>
+	  </tr>
 </table>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
@@ -56,8 +59,8 @@
 <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>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
-
+<p><img src="../images/nokia2007Copyright.png" alt="Nokia Copyright Statement" ><br>
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
index cd98ca72465..09094fc5e4b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_dissassembly_view.htm
@@ -47,7 +47,7 @@
 <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/NokiaCopyrightStatement07.png" ALT="Nokia Copyright Statement" > 
+<img src="../images/nokia2007Copyright.png" alt="Nokia Copyright Statement" width="255" height="14" > 
 </body>
 
 </html>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
index 89d48a6bc7b..628689004b7 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
@@ -41,7 +41,7 @@
 <br>
 <a href="../reference/cdt_u_debug.htm">Debug preferences</a></p>
 <hr>
-<img src="../images/nokia2007Copyright.png" ALT="Nokia Copyright Statement" >
+<img src="../images/nokia2007Copyright.png" alt="Nokia Copyright Statement" >
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
index 44cb062a8fa..0990abe671f 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addrmv_brk_action.htm
@@ -47,7 +47,7 @@
 <br>
 <a href="../reference/cdt_u_debug.htm">Debug preferences</a></p>
 <hr>
-<img src="../images/nokia2007Copyright.png" ALT="Nokia Copyright Statement" >
+<img src="../images/nokia2007Copyright.png" alt="Nokia Copyright Statement" >
 
 </body>
 
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 3fbb745e7dd..0bd48c3762a 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -52,6 +52,7 @@
 		<topic label="Build Console preferences" href="reference/cdt_u_build_pref.htm"/>
 		
 		<topic label="Debug preferences" href="reference/cdt_u_debug.htm">
+			<topic label="Breakpoint Actions preferences" href="reference/cdt_u_dbg_brkpt_actions.htm"/>
 			<topic label="GDB MI preferences" href="reference/cdt_u_gdb_mi.htm"/>
 			<topic label="Source Code Locations preferences" href="reference/cdt_u_dbg_src.htm"/>
 		</topic>
@@ -69,7 +70,10 @@
 		</topic>
 		
 		<topic label="File Types" href="reference/cdt_u_c_file_types.htm"/>
-		<topic label="Make" href="reference/cdt_u_make_pref.htm"/>
+		<topic label="Make" href="reference/cdt_u_make_pref.htm" >
+			<topic label="Makefile Editor" href="reference/cdt_u_makefile_settings_pref.htm"/>
+			<topic label="Settings" href="reference/cdt_u_make_settings_pref.htm"/>			
+		</topic>
 		
 		<topic label="New Make Projects properties" href="reference/cdt_o_proj_prop_pages.htm">
 			<topic label="Make Builder" href="reference/cdt_u_newproj_buildset.htm"/>