diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm
index 083f0d75c00..08a98c70541 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_editor.htm
@@ -35,7 +35,6 @@ This C/C++ editor is invoked automatically when you edit a C/C++ source file.</p
 </p>
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
-<br><a href="../reference/cdt_u_editor_key_bind.htm">C/C++ editor key binding actions</a>
 <br><a href="../reference/cdt_o_ceditor_pref.htm">C/C++ editor preferences</a>
 <br><a href="../reference/cdt_u_outline_view.htm">Outline view for C/C++</a>
 <br><a href="../reference/cdt_o_views.htm">Views and editors</a>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer.htm
index 0ee6b8d437d..652bd25d7a9 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer.htm
@@ -54,15 +54,12 @@ Indexer</a><br>
 <a href="../tasks/cdt_t_indexer_enablectags.html">Enable/Disable the
 CTags
 Indexer</a><br>
-<a href="../tasks/cdt_t_indexer_timeout.htm"></a><a
+<a
  href="../tasks/cdt_t_set_src_fold.htm">Setting Source Folders</a><br>
 </p>
 <p><img border="0" src="../images/ngref.gif" alt="Related reference"
  width="143" height="21">
 <br>
-<a href="../reference/cdt_u_search_pref.htm">Search, C/C++ Preferences
-window</a>
-<br>
 <a href="../reference/cdt_u_search.htm">C/C++ search page, Search
 dialog box</a>
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_ctagsindexer.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_ctagsindexer.htm
index c09778d3dd5..5a3771bf70b 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_ctagsindexer.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_ctagsindexer.htm
@@ -38,15 +38,12 @@ elements</a><br>
 <a href="cdt_c_indexer_fullindexer.htm">Enable/Disable the Full C/C++
 Indexer</a><br>
 <a href="cdt_c_indexer_ctagsindexer.htm">Enable/Disable the CTags
-Indexer</a><a href="../tasks/cdt_t_indexer_timeout.htm"></a><br>
+Indexer</a><br>
 <a href="../tasks/cdt_t_set_src_fold.htm">Setting Source Folders</a><br>
 </p>
 <p><img height="21" width="143" alt="Related reference"
  src="../images/ngref.gif" border="0">
 <br>
-<a href="../reference/cdt_u_search_pref.htm">Search, C/C++ Preferences
-window</a>
-<br>
 <a href="../reference/cdt_u_search.htm">C/C++ search page, Search
 dialog box</a>
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_fullindexer.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_fullindexer.htm
index 8def4a973e9..9a0c3533e37 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_fullindexer.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_fullindexer.htm
@@ -30,7 +30,7 @@ a project</a><br>
  width="143" height="21"><br>
 <a href="../tasks/cdt_t_sel_search.htm">Selection Searching for C/C++
 elements</a><br>
-<a href="../tasks/cdt_t_indexer_timeout.htm"></a><a
+<a
  href="../tasks/cdt_t_indexer_enablefull.htm">Enable/Disable the Full
 C/C++
 Indexer</a><br>
@@ -42,9 +42,6 @@ Indexer</a><br>
 <p><img border="0" src="../images/ngref.gif" alt="Related reference"
  width="143" height="21">
 <br>
-<a href="../reference/cdt_u_search_pref.htm">Search, C/C++ Preferences
-window</a>
-<br>
 <a href="../reference/cdt_u_search.htm">C/C++ search page, Search
 dialog box</a>
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_open_close.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_open_close.htm
index 5a27af708c3..8d5b21cc52f 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_open_close.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_open_close.htm
@@ -29,15 +29,12 @@ C/C++
 Indexer</a><br>
 <a href="../tasks/cdt_t_indexer_enablectags.html">Enable/Disable the
 CTags
-Indexer</a><a href="../tasks/cdt_t_indexer_timeout.htm"></a><br>
+Indexer</a><br>
 <a href="../tasks/cdt_t_set_src_fold.htm">Setting Source Folders</a><br>
 </p>
 <p><img height="21" width="143" alt="Related reference"
  src="../images/ngref.gif" border="0">
 <br>
-<a href="../reference/cdt_u_search_pref.htm">Search, C/C++ Preferences
-window</a>
-<br>
 <a href="../reference/cdt_u_search.htm">C/C++ search page, Search
 dialog box</a>
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_prog_bar.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_prog_bar.htm
index cc3b62c76b9..8f9b240dae0 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_prog_bar.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_indexer_prog_bar.htm
@@ -35,15 +35,12 @@ elements</a><br>
 <a href="../tasks/cdt_t_indexer_enablefull.htm">Enable/Disable the Full
 C/C++ Indexer</a><br>
 <a href="../tasks/cdt_t_indexer_enablectags.html">Enable/Disable the
-CTags Indexer</a><a href="../tasks/cdt_t_indexer_timeout.htm"></a><br>
+CTags Indexer</a><br>
 <a href="../tasks/cdt_t_set_src_fold.htm">Setting Source Folders</a><br>
 </p>
 <p><img height="21" width="143" alt="Related reference"
  src="../images/ngref.gif" border="0">
 <br>
-<a href="../reference/cdt_u_search_pref.htm">Search, C/C++ Preferences
-window</a>
-<br>
 <a href="../reference/cdt_u_search.htm">C/C++ search page, Search
 dialog box</a>
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_open_declarations.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_open_declarations.htm
index 8226f5c612e..1cbbf18d01e 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_open_declarations.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_open_declarations.htm
@@ -20,7 +20,7 @@
 Open declaration requires your file to have the proper include paths set up to the declaration.  
 If for any reason open declaration cannot find the declaration, it will display the following message in the status line:</p>
 
-<img src="../images/open_declaration_error.png"  alt="This operation is unavailable on the current selection message.">
+<img src="../images/open_declaration_error.png"  alt="No declaration was found message.">
 
 <p>For more information see <a href="../tasks/cdt_t_proj_paths.htm">Adding Include paths and symbols</a>.</p>
 
@@ -30,6 +30,7 @@ If for any reason open declaration cannot find the declaration, it will display
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"> <br>
 <a href="../tasks/cdt_t_proj_paths.htm">Adding Include paths and symbols</a><br>
 <a href="../tasks/cdt_t_open_declarations.htm">Navigate to a C or C++ element's declaration</a><br>
+<a href="../tasks/cdt_t_open_definitions.htm">Navigate to a C or C++ element's definition</a><br>
 <a href="../tasks/cdt_t_search.htm">Searching for C/C++ elements</a></p>
 
 <p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" BORDER="0" width="324" height="14"> </p>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_open_definitions.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_open_definitions.htm
new file mode 100644
index 00000000000..3d474b90ebd
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_open_definitions.htm
@@ -0,0 +1,40 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Open definitions</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h1>Open definition</h1>
+
+<p>You can select an element name in your code and quickly navigate to its definition.</p>
+
+<img src="../images/openDefinition.png"  alt="Editor View showing Open Definition option">
+
+<p>Open definition will attempt to navigate to the exact definition of the selected element.  
+Open definition requires your file to have the proper include paths set up to the definition.  
+If for any reason open definition cannot find the definition, it will display the following message in the status line:</p>
+
+<img src="../images/open_definition_error.png"  alt="No definition was found message.">
+
+<p>For more information see <a href="../tasks/cdt_t_proj_paths.htm">Adding Include paths and symbols</a>.</p>
+
+<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
+<a href="cdt_c_projects.htm">CDT Projects</a><br>
+<a href="cdt_c_search.htm">C/C++ search</a></p>
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"> <br>
+<a href="../tasks/cdt_t_proj_paths.htm">Adding Include paths and symbols</a><br>
+<a href="../tasks/cdt_t_open_declarations.htm">Navigate to a C or C++ element's declaration</a><br>
+<a href="../tasks/cdt_t_open_definitions.htm">Navigate to a C or C++ element's definition</a><br>
+<a href="../tasks/cdt_t_search.htm">Searching for C/C++ elements</a></p>
+
+<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" BORDER="0" width="324" height="14"> </p>
+
+</body>
+
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
index 74a645ea079..74b3732ce51 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_outlineview.htm
@@ -101,6 +101,7 @@ items:</p>
 <a href="cdt_c_content_assist.htm">Content Assist and code completion</a><br>
 <a href="cdt_c_search.htm">C/C++ search</a><br>
 <a href="cdt_c_open_declarations.htm">Open Declarations</a><br>
+<a href="cdt_c_open_definitions.htm">Open Definitions</a><br>
 &nbsp;</p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm
index 58be204a3ad..9c3cfe46752 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_search.htm
@@ -253,11 +253,15 @@ your last search.</p>
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"><br>
 <a href="../concepts/cdt_c_indexer.htm">C/C++ Indexer</a><br>
 <a href="cdt_c_projects.htm">CDT Projects</a><br>
-<a href="cdt_c_open_declarations.htm">Open Declarations</a></p>
+<a href="cdt_c_open_declarations.htm">Open Declarations</a><br>
+<a href="cdt_c_open_definitions.htm">Open Definitions</a>
+</p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
 <br>
 <a href="../tasks/cdt_t_search.htm">Searching for C/C++ elements</a><br>
-<a href="../tasks/cdt_t_open_declarations.htm">Navigating to C/C++ declarations</a></p>
+<a href="../tasks/cdt_t_open_declarations.htm">Navigating to C/C++ declarations</a><br>
+<a href="../tasks/cdt_t_open_definitions.htm">Navigating to C/C++ definitions</a>
+</p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"> <br>
 <a href="../reference/cdt_u_search.htm">C/C++ search page, Search dialog box</a><br>
 <a href="../reference/cdt_u_icons.htm">C/C++ perspective icons</a></p><p>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
index 71c0c410cf0..7cbdd2d3c64 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_templates.htm
@@ -34,7 +34,7 @@ The templates that begin with that character appear. Double-click on a template
 </p>
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
-<br><a href="../reference/cdt_u_menu_edit.htm">Edit menu</a>
+<br><a href="../reference/cdt_u_m_edit.htm">Edit menu</a>
 <br><a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist page, Preferences window</a>
 <br><a href="../reference/cdt_u_code_temp.htm">Code Templates page, Preferences window</a>
 </p>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
index fbc1150c8d0..1d8c9fe4e6b 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
@@ -32,6 +32,7 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_proj_file_views.htm">Project File views</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none">Make Targets View</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_declarations.htm">Open declaration</a><br>
+	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_definitions.htm">Open definitions</a><br>	
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none">Open Type</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none">Class Browser</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none">Heirarchy View</a><br>
@@ -47,7 +48,6 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration: none;">Invoking Make</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_search.htm">C/C++ search</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_indexer.htm">C/C++ Indexer</a><br>
-	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_indexer_prob_rep.htm">C/C++ Indexer Problem Reporting</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_indexer_open_close.htm">C/C++ Indexer Opening or Closing a project</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_indexer_prog_bar.htm">C/C++ Indexer Progress Bar</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_search_ext.htm">Searching External Files</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_nav.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_nav.htm
index 86566898438..af641e39541 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_nav.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_nav.htm
@@ -17,6 +17,7 @@
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none">Make Targets View</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_search.htm">C/C++ search</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_declarations.htm">Open declarations</a><br>
+	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_definitions.htm">Open definitions</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none">Open Type</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none">Class Browser</a><br>
 
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
index bfd638190c5..292a67ed9da 100644
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT_DEBUGGER.xml
@@ -56,12 +56,6 @@
    	label="&modulesView;"/>
 </context>
 
-<context id ="shared_libraries_preference_page_context">
-   <description>Set the refresh preference for the Shared Libraries view. </description>
-   <topic href="reference/cdt_u_shared_lib_view_pref.htm"
-   	label="&sharedLibsViewPrefs;"/>
-</context>
-
 <context id ="signals_view_context">
    <description>Click below to see help</description>
    <topic href="reference/cdt_u_signals_view.htm"
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_pref_parser.png b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_parser.png
new file mode 100644
index 00000000000..d6ad247028e
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_pref_parser.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/openDeclaration.png b/doc/org.eclipse.cdt.doc.user/images/openDeclaration.png
index 0272a925c14..032537e0085 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/openDeclaration.png and b/doc/org.eclipse.cdt.doc.user/images/openDeclaration.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/openDefinition.png b/doc/org.eclipse.cdt.doc.user/images/openDefinition.png
new file mode 100644
index 00000000000..b594408ce5d
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/openDefinition.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/open_declaration_error.png b/doc/org.eclipse.cdt.doc.user/images/open_declaration_error.png
index 432412605cd..5860b37e15f 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/open_declaration_error.png and b/doc/org.eclipse.cdt.doc.user/images/open_declaration_error.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/open_definition_error.png b/doc/org.eclipse.cdt.doc.user/images/open_definition_error.png
new file mode 100644
index 00000000000..fbcf418bbfb
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/open_definition_error.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_parser_perf.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_parser_perf.htm
new file mode 100644
index 00000000000..0ae75844bca
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_parser_perf.htm
@@ -0,0 +1,24 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>C/C++ Parser preferences</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h1>C/C++ Parser preferences</h1>
+
+<p>This section describes how to set preferences for the C/C++ parser.</p>
+
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_parser_codereader_cache_pref.htm">CodeReader Buffer Size preferences</a><br>
+
+
+<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
+
+
+</body>
+</html>
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 2f9b3afe48f..1420c185fad 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
@@ -22,7 +22,6 @@
 	<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_u_search_view.htm">Search 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>
@@ -63,8 +62,9 @@
 		<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="100" height="1" alt=""><a style="text-decoration:none" href="reference/cdt_o_mproj_pref.htm">Managed Make Project preferences</a><br>
-	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_search_pref.htm">Search preferences</a><br>
+	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_mproj_pref.htm">Managed Make Project preferences</a><br>
+	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_parser_pref.htm">C/C++ Parser preferences</a><br>
+		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_parser_codereader_cache_pref.htm">CodeReader Buffer Size 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++ Project Properties</a><br>
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_mmake_proj.htm">Managed Make Projects</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_info.htm">Info</a><br>
@@ -85,7 +85,6 @@
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mfile_info.htm">Info</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mfile_build.htm">C/C++ Build</a><br>
 			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mfile_tool_settings.htm">Tool Settings</a><br>
-			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mfile_rbcs.htm">Custom Build Steps</a><br>
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_smake_proj.htm">Standard Make Projects</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_sprop_info.htm">Info</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_sprop_builders.htm">Builders</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_parser_codereader_cache_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_parser_codereader_cache_pref.htm
new file mode 100644
index 00000000000..e74a488bb9e
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_parser_codereader_cache_pref.htm
@@ -0,0 +1,23 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>CodeReader Buffer Size preferences</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>CodeReader Buffer Size preferences</h1>
+
+<p>You can define what the size of the CodeReader Buffer Size is.  The CodeReader Buffer is used by the parser to load files from a cache which prevents unnecessary disk and network I/O.</p>
+<p><img src="../images/cdt_pref_parser.png" alt="Parser Preferences Dialog Box"></p>
+<dl>
+  <dt>Size (MB)</dt>
+  <dd>Specify the size of the CodeReader Buffer in MB (default is 64).</dd>
+</dl>
+
+</body>
+
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm
index 345e07a941f..be3494c7192 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_m_project.htm
@@ -67,14 +67,6 @@
 </tr>
 </table></p>
 
-<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
-<br><a href="../Concepts/cdtconcepts-4.htm">C/C++ compiler</a>
-</p>
-
-<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
-<br><a href="../Tasks/cdttasks-106.htm">Building a program</a>
-</p>
-
 <p>
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
 </p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_shared_lib_view_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_shared_lib_view_pref.htm
deleted file mode 100644
index 68aac399c25..00000000000
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_shared_lib_view_pref.htm
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-
-<head>
-<meta http-equiv="Content-Language" content="en-us">
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Shared Libraries view preferences</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-<body>
-
-<h1>Shared Libraries view preferences</h1>
-
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > 
-
-</p>
-
-</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
index a21ff0fc391..530861597df 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
@@ -33,6 +33,7 @@
 		<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_imp_code_temp.htm">Importing and exporting code templates</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_shift_code.htm">Shifting lines of code to the right or left</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_open_declarations.htm">Navigating to C/C++ declarations</a><br>
+	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_open_definitions.htm">Navigating to C/C++ definitions</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_refactoring.htm">Refactoring</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_build_task.htm">Building projects</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_rename.htm">Renaming a project</a><br>
@@ -80,7 +81,6 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_sel_search.htm">Selection Searching for C/C++ elements</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_search_ext.htm">Searching External Files</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_endis_indexer.htm">Enable/Disable the C/C++ Indexer</a><br>
-	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_indexer_prob_rep.htm">C/C++ Indexer Problem Reporting</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_indexer_timeout.htm">C/C++ Indexer - Indexer Timeout</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_set_src_fold.htm">Setting Source Folders</a><br>
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm
index 583c1d22823..8886ecf8983 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm
@@ -22,6 +22,7 @@
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_search.htm">Searching for C/C++ elements</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_sel_search.htm">Selection Searching for C/C++ elements</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_open_declarations.htm">Navigating to C/C++ declarations</a><br>
+	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_open_definitions.htm">Navigating to C/C++ definitions</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_refactoring.htm">Refactoring</a><br>
 
 <p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm
index a647af08a9b..7a40f8aef66 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_declarations.htm
@@ -32,6 +32,7 @@ element declarations on successfully compiled programs.</p>
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
 <br>
 <a href="../concepts/cdt_c_open_declarations.htm">Open Declarations</a><br>
+<a href="../concepts/cdt_c_open_definitions.htm">Open Definitions</a><br>
 <a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
 <a href="../concepts/cdt_c_search.htm">C/C++ search</a></p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_definitions.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_definitions.htm
new file mode 100644
index 00000000000..b710306e1b3
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_open_definitions.htm
@@ -0,0 +1,49 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+
+<head>
+<meta http-equiv="Content-Language" content="en-us">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Navigating to C/C++ declarations</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h1>Navigating to C/C++ definition</h1>
+
+<p>The Open Definition feature lets you navigate to the definition that matches a 
+selected element in the C/C++ editor. It is recommended that you look for 
+element definitions on successfully compiled programs.</p>
+
+<p>To navigate to C/C++ definition:</p>
+
+<ol>
+  <li>In the C/C++ editor, select an object.</li>
+  <li>Right-click the selected element, select <b>Open Definition</b>.<br>
+  <img src="../images/openDefinition.png"  alt="Editor View showing Open Definition option" >
+  </li>
+</ol>
+
+<p>For more information, see:<ul>
+  <li> <b>Workbench User Guide &gt; Tasks&gt; Navigating and finding resources</b></li>
+  </ul>
+
+<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
+<br>
+<a href="../concepts/cdt_c_open_declarations.htm">Open Declarations</a><br>
+<a href="../concepts/cdt_c_open_definitions.htm">Open Definitions</a><br>
+<a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
+<a href="../concepts/cdt_c_search.htm">C/C++ search</a></p>
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
+<br>
+<a href="cdt_t_search.htm">Searching for C/C++ elements</a></p>
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
+<br>
+<a href="../reference/cdt_u_search.htm">C/C++ search page, Search dialog box</a></p>
+
+<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
+
+</body>
+
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm
index e6690d87ebf..a9b89cd1b46 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_refactoring.htm
@@ -23,6 +23,7 @@
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
 <br>
 <a href="../concepts/cdt_c_open_declarations.htm">Open Declarations</a><br>
+<a href="../concepts/cdt_c_open_definitions.htm">Open Definitions</a><br>
 <a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
 <a href="../concepts/cdt_c_search.htm">C/C++ search</a></p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm
index 324a12784ce..603f5fa4ee8 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_search.htm
@@ -129,11 +129,15 @@ The info required to do a search is:
 <a href="../concepts/cdt_c_search.htm">C/C++ search</a><br>
 <a href="../concepts/cdt_c_indexer.htm">C/C++ Indexer</a><br>
 <a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
-<a href="../concepts/cdt_c_open_declarations.htm">Open Declarations</a></p>
+<a href="../concepts/cdt_c_open_declarations.htm">Open Declarations</a><br>
+<a href="../concepts/cdt_c_open_definitions.htm">Open Definitions</a>
+</p>
 
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"><br>
 <a href="cdt_t_sel_search.htm">Selection Searching for C/C++ elements</a><br>
-<a href="cdt_t_open_declarations.htm">Navigate to C/C++ declarations</a></p>
+<a href="cdt_t_open_declarations.htm">Navigate to C/C++ declarations</a><br>
+<a href="cdt_t_open_definitions.htm">Navigate to C/C++ definitions</a>
+</p>
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm
index ef55b2869e6..fad8e321309 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_sel_search.htm
@@ -47,10 +47,14 @@ include paths and symbols are correctly defined. For more information, see
 <br>
 <a href="../concepts/cdt_c_search.htm">C/C++ search</a><br>
 <a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
-<a href="../concepts/cdt_c_open_declarations.htm">Open Declarations</a></p>
+<a href="../concepts/cdt_c_open_declarations.htm">Open Declarations</a><br>
+<a href="../concepts/cdt_c_open_definitions.htm">Open Definitions</a>
+</p>
 <p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"><br>
 <a href="cdt_t_search.htm">Searching for C/C++ elements</a><br>
-<a href="cdt_t_open_declarations.htm">Navigate to C/C++ declarations</a></p>
+<a href="cdt_t_open_declarations.htm">Navigate to C/C++ declarations</a><br>
+<a href="cdt_t_open_definitions.htm">Navigate to C/C++ definitions</a>
+</p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="../reference/cdt_u_search.htm">C/C++ search page, Search dialog box</a></p>
 <p>&nbsp;</p>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm
index b91e8eb7abc..50f5e8714fa 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm
@@ -42,7 +42,9 @@ files by type in the C/C++ Projects view</a>.</p>
 <a href="cdt_t_prvw_hide_files.htm">Hiding files by type in the C/C++ Projects 
 view</a><br>
 <a href="cdt_t_search.htm">Searching for C/C++ elements</a><br>
-<a href="cdt_t_open_declarations.htm">Navigate to C/C++ declarations</a></p>
+<a href="cdt_t_open_declarations.htm">Navigate to C/C++ declarations</a><br>
+<a href="cdt_t_open_definitions.htm">Navigate to C/C++ definitions</a>
+</p>
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
 <br>
 <a href="../reference/cdt_o_ceditor_pref.htm">C/C++ editor, code templates and search 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/indexer_importing_large_project.html b/doc/org.eclipse.cdt.doc.user/tasks/indexer_importing_large_project.html
index 12496d25149..6c19c7ad4ae 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/indexer_importing_large_project.html
+++ b/doc/org.eclipse.cdt.doc.user/tasks/indexer_importing_large_project.html
@@ -25,7 +25,7 @@ approach to importing large projects.<br>
 button and browse to the root directory of your project</li>
 </ul>
 <p>&nbsp;&nbsp;&nbsp; <img style="width: 596px; height: 310px;"
- src="file:///E:/CDT/3.1/eclipse/org.eclipse.cdt.doc.user/images/indexer_import_largeproject1.PNG"
+ src="../images/indexer_import_largeproject1.PNG"
  alt="Import project setup"></p>
 <ul>
   <li>Click on <span style="font-weight: bold;">Next <br>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
index 46c58f7368c..5bba3a7eb03 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
@@ -19,7 +19,8 @@
 	<topic label="Navigation aids" href="concepts/cdt_o_nav.htm"> 
 		<topic label="Outline View" href="concepts/cdt_c_outlineview.htm"/> 
 		<topic label="Project File views" href="concepts/cdt_c_proj_file_views.htm"/> 
-		<topic label="Open declarations" href="concepts/cdt_c_open_declarations.htm"/> 
+		<topic label="Open declarations" href="concepts/cdt_c_open_declarations.htm"/>
+		<topic label="Open definitions" href="concepts/cdt_c_open_definitions.htm"/>
 	</topic>
 	<topic label="Build" href="concepts/cdt_o_build_conc.htm"> 
 		<topic label="Building C/C++ Projects" href="concepts/cdt_c_build_over.htm"/> 
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index bad46219d71..60f699027bf 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -25,6 +25,7 @@
 			</topic>
 			<topic label="Shift lines of code to the left or right" href="tasks/cdt_t_shift_code.htm"/>
 			<topic label="Navigate to C/C++ declarations by name" href="tasks/cdt_t_open_declarations.htm"/>
+			<topic label="Navigate to C/C++ declarations by name" href="tasks/cdt_t_open_definitions.htm"/>
 			<topic label="Refactoring" href="tasks/cdt_t_refactoring.htm"/>
 		</topic>
 		<topic label="Building projects" href="tasks/cdt_o_build_task.htm">