diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
index 91f2472f8d1..d35e72764a3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
@@ -12,78 +12,89 @@
 <h1>Reference</h1>
 <p>This section describes the Views, Windows and Dialog Boxes available from the C/C++ perspective.</p>
 
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_views.htm">C/C++ Views and Editors</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_views.htm">Selecting Views and Editors</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_cproj_view.htm">C/C++ Projects view</a><br>	
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_project_explorer_view.htm">Project Explorer view</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_outline_view.htm">Outline view</a><br>	
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_targets_view.htm">Make Targets view</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_editor_view.htm">Editor view</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_console_view.htm">Console view</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_problems_view.htm">Problems view</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_properties_view.htm">Properties view</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_view.htm">Debug views</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">Registers view</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Memory view</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Memory view preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_modules_view.htm">Modules view</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">Signals view</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">Debug view</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_pref.htm">Debug preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_icons.htm">C/C++ Icons</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_menu.htm">C/C++ Menubar</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_file.htm">File Menu actions</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_edit.htm">Edit Menu actions</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_refactor.htm">Refactor Menu actions</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_navigate.htm">Navigate Menu actions</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_search.htm">Search Menu actions</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_project.htm">Project Menu actions</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_run.htm">Run Menu actions</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_window.htm">Window Menu actions</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_toolbar.htm">C/C++ Toolbar</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_open_element.htm">Open Element</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_create_make_target.htm">Create a Make Target</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_find_replace.htm">Find/Replace</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_pref.htm">C/C++ Preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_build_pref.htm">Build Console preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_debug.htm">Debug preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_gdb_mi.htm">GDB MI preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_src.htm">Source Code Locations preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_style_pref.htm">Code Style preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_templates_pref.htm">Code Templates preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_ceditor_pref.htm">C/C++ Editor preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">General preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist preferences</a><br>
-			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist_adv.htm">Advanced preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_folding.htm">Folding preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_hov.htm">Hovers preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_mark_occurrences.htm">Mark Occurrences preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_scalability.htm">Scalability preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Syntax Coloring preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Templates preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_typing.htm">Typing preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_file_types.htm">File Types preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_pref.htm">Make preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_proj_prop_pages.htm">New Make Projects properties preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_buildset.htm">Make Builder preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_error.htm">Error Parser preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_binary.htm">Binary Parser preferences</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_discovery_preferences.htm">Discovery Options preferences</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_properties.htm">C/C++ Properties</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_proj.htm">C/C++ Project Properties</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_folder.htm">C/C++ Folder Properties</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_file.htm">C/C++ File Properties</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz.htm">C/C++ New Project Wizard</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_run_dbg_pages.htm">C/C++ Run and Debug</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_main.htm">Main</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_arg.htm">Arguments</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_env.htm">Environment</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_dbg.htm">Debugger</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_srce.htm">Source</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_comm.htm">Common</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_search.htm">C/C++ search</a><br>
-
-<p><img src="../images/ng00_07.gif" ALT="IBM Copyright Statement" ></p>
+<p><img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_views.htm">C/C++ Views and Editors</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_views.htm">Selecting Views and Editors</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_cproj_view.htm">C/C++ Projects view</a><br>	
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_project_explorer_view.htm">Project Explorer view</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_outline_view.htm">Outline view</a><br>	
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_targets_view.htm">Make Targets view</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_editor_view.htm">Editor view</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_console_view.htm">Console view</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_problems_view.htm">Problems view</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_properties_view.htm">Properties view</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_view.htm">Debug views</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">Registers view</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Memory view</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Memory view preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_modules_view.htm">Modules view</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">Signals view</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">Debug view</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_pref.htm">Debug preferences</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_icons.htm">C/C++ Icons</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_menu.htm">C/C++ Menubar</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_file.htm">File Menu actions</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_edit.htm">Edit Menu actions</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_refactor.htm">Refactor Menu actions</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_navigate.htm">Navigate Menu actions</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_search.htm">Search Menu actions</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_project.htm">Project Menu actions</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_run.htm">Run Menu actions</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_m_window.htm">Window Menu actions</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_toolbar.htm">C/C++ Toolbar</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_open_element.htm">Open Element</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_create_make_target.htm">Create a Make Target</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_find_replace.htm">Find/Replace</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_pref.htm">C/C++ preferences</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_appearance_pref.htm">Appearance</a><br>
+      <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_pref_build.htm">Build preferences</a><br>
+      <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_console_pref.htm">Console</a><br>
+<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_environment_pref.htm">Environment<br>
+</a><a style="text-decoration:none" href="cdt_u_make_pref.htm"><img src="../images/trans.gif" border="0" width="150" height="1" alt="">Make Targets</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_makefile_settings_pref.htm">Makefile Editor</a><br>
+  <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_settings_pref.htm">Settings</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_debug.htm">Debug preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_brkpt_actions.htm">Breakpoint Actions</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_src.htm">Common Source Lookup Path</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_gdb_mi.htm">GDB MI preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_style_pref.htm">Code Style preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_code_templates_pref.htm">Code Templates</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">Editor preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist</a><br>
+  <img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist_adv.htm">Advanced</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_folding.htm">Folding</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_hov.htm">Hovers</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_mark_occurrences.htm">Mark Occurrences<br>      
+      </a><img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_save_actions.htm">Save Actions</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_scalability.htm">Scalability</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Syntax Coloring</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Templates</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_typing.htm">Typing</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_file_types.htm">File Types</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_indexer_preference.html">Indexer</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_language_mapping_pref.htm">Language Mappings</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_pref.htm"></a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_proj_prop_pages.htm">New Make Projects properties preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_buildset.htm">Make Builder preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_error.htm">Error Parser preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_binary.htm">Binary Parser preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_discovery_preferences.htm">Discovery Options preferences</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_properties.htm">C/C++ Properties</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_proj.htm">C/C++ Project Properties</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_folder.htm">C/C++ Folder Properties</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_prop_file.htm">C/C++ File Properties</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz.htm">C/C++ New Project Wizard</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_run_dbg_pages.htm">C/C++ Run and Debug</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_main.htm">Main</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_arg.htm">Arguments</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_env.htm">Environment</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_dbg.htm">Debugger</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_srce.htm">Source</a><br>
+  <img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_run_dbg_comm.htm">Common</a><br>
+  <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_search.htm">C/C++ search</a><br>
+</p>
+<p><img src="../images/ng00_07.gif" ALT="IBM Copyright Statement" ><br>
+  <img src="../images/nokiaCopyright.png" width="375" height="12"><br>
+</p>
 
 </body>
 </html>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html
index c42245a09d8..6dfc1735708 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_indexer_preference.html
@@ -3,11 +3,11 @@
 <head>
   <meta http-equiv="Content-Language" content="en-us">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>Indexer Preference page</title>
+  <title>Indexer preferences (C/C++)</title>
   <link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h1>Indexer Preference page</h1>
+<h1>Indexer preferences (C/C++)</h1>
 <p>Use the <strong>Indexer</strong> preference page to select the indexer used by default for new projects and configure its behavior.</p>
 <p> <img src="../images/indexer_preference_page.PNG"
  alt="Indexer Preferences Window" ><br>
@@ -91,7 +91,7 @@ editor</a></p>
 <a href="cdt_u_m_search.htm">Search action</a><br>
 <a href="cdt_u_search_view.htm">Search view</a><br>
 </p>
-<p><img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="255" height="14"><br>
+<p><img src="../images/nokiaCopyright.png" alt="Nokia Copyright Statement" width="375" height="12"><br>
   <img src="../images/ng00_05a.gif" alt="Copyright"
  style="width: 324px; height: 14px;"><br>
 </p>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 07f54e6f762..44e0249148f 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -52,14 +52,14 @@
 	<!-- PREFERENCE TOPICS -->
 	<topic label="C/C++ preferences" href="reference/cdt_u_c_pref.htm">
 		<topic label="Appearance" href="reference/cdt_u_appearance_pref.htm"/>
-	  <topic href="reference/cdt_u_pref_build.htm" label="Build preferences">
+	    <topic href="reference/cdt_u_pref_build.htm" label="Build preferences">
 			<topic label="Console" href="reference/cdt_u_console_pref.htm"/>
 			<topic label="Environment" href="reference/cdt_u_environment_pref.htm"/>
 			<topic label="Make Targets" 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>
+	    </topic>
 		
 		<topic label="Code Style preferences" href="reference/cdt_u_c_code_style_pref.htm">
 			<topic label="Code Templates" href="reference/cdt_u_c_code_templates_pref.htm"/>
@@ -87,7 +87,7 @@
 		</topic>
 		
 		<topic label="File Types" href="reference/cdt_u_c_file_types.htm"/>
-
+		<topic label="Indexer" href="reference/cdt_u_indexer_preference.html"/>
 		<topic label="Language Mappings" href="reference/cdt_u_language_mapping_pref.htm"/>
 		
 		<topic label="New CDT project wizard">
@@ -101,6 +101,7 @@
 				<topic label="Behavior" href="reference/cdt_u_newproj_behavior.htm"/>
 			</topic>
 		</topic>
+		
 		<topic label="Property Pages Settings" href="reference/cdt_u_pref_prop_pages.htm">
 			<topic label="Multiple Configurations Edit" href="reference/cdt_u_pref_multi_cfg.htm"/>
 	    </topic>