diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
index ecb4e28d992..ee6de77f206 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
@@ -19,7 +19,7 @@
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_prvw_hide_files.htm">Hiding files by type in the C/C++ Projects view</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_convert_cdt_proj.htm">Converting CDT 1.x Projects</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_add_custom_persp.htm">Adding Convert to a C/C++ Make Project to the New menu</a><br>
-
+	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_discovery.htm">Set Discovery Options</a><br>
 
 <p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
 </body>
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 0bcb8dfdb5e..d89f419e077 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
@@ -22,6 +22,7 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_prvw_hide_files.htm">Hiding files by type in the C/C++ Projects view</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_convert_cdt_proj.htm">Converting CDT 1.x Projects</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_add_custom_persp.htm">Adding Convert to a C/C++ Make Project to the New menu</a><br>
+	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_discovery.htm">Set Discovery Options</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_write_code.htm">Writing code</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_cust_cpp_editor.htm">Customizing the C/C++ editor</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_comment_out.htm">Commenting out code</a><br>
@@ -31,6 +32,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_search.htm">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_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_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_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>
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 01387fe55d1..c452a8b8a82 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
@@ -20,6 +20,7 @@
 		<img src="../images/trans.gif" border="0" width="50" 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="25" 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="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_refactoring.htm">Refactoring</a><br>
 
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
index 2b09f2584cb..cd9106abfbd 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
@@ -23,7 +23,7 @@
 	</topic>
 	<topic label="Build" href="concepts/cdt_o_build_conc.htm"> 
 		<topic label="Building C/C++ Projects" href="concepts/cdt_c_build_over.htm"/> 
-		<topic label="Manage Build Extensibility Document" href="concepts/http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project"/>
+		<topic label="Manage Build Extensibility Document" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project"/>
 	</topic>
 	<topic label="Debug" href="concepts/cdt_o_dbg_concepts.htm">
 		<topic label="Adding Break Points" href="concepts/cdt_c_brkpnts.htm"/> 
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 9ffb1ea630a..2d7ef658db5 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -44,6 +44,7 @@
 		<topic label="Debug preferences" href="reference/cdt_u_debug.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>
 		<topic label="C/C++ Editor preferences" href="reference/cdt_o_ceditor_pref.htm">
 			<topic label="General preferences" href="reference/cdt_u_c_editor_gen.htm"/>
 			<topic label="Colors preferences" href="reference/cdt_u_c_editor_color.htm"/>
@@ -59,7 +60,7 @@
 			<topic label="Binary Parser" href="reference/cdt_u_newproj_parser_binary.htm"/>
 			<topic label="Discovery Options" href="reference/cdt_u_discovery_preferences.htm"/>
 		</topic>
-		<topic label="Search preferences" href="reference/cdt_u_search_pref.htm">
+		<topic label="Search preferences" href="reference/cdt_u_search_pref.htm"/>
 	</topic>
 	<topic label="C/C++ Project Properties" href="reference/cdt_u_properties.htm">
 		<topic label="Managed Make Projects" href="reference/cdt_o_mmake_proj.htm">
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index a938e81e5c5..18555b94b4b 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -7,11 +7,12 @@
 		<topic label="Work with C or C++ project files" href="tasks/cdt_o_proj_files.htm">
 			<topic label="Display file members in the C/C++ Projects view" href="tasks/cdt_t_show_proj_files.htm"/>
 			<topic label="Assign a C or C++ nature to a project" href="tasks/cdt_t_conv_proj.htm"/>
-			<topic label="Create a cpp file" href="tasks/cdt_t_new_cpp.htm"/>
+			<topic label="Create a C/C++ file" href="tasks/cdt_t_new_cpp.htm"/>
 			<topic label="Create a makefile" href="tasks/cdt_t_new_make.htm"/>
 			<topic label="Hide files of a given type" href="tasks/cdt_t_prvw_hide_files.htm"/>
-			<topic label="Converting CDT 1.x Projects" href="cdt_t_convert_cdt_proj.htm"/>
-			<topic label="Adding Convert to a C/C++ Make Project to the New menu" href="cdt_t_add_custom_persp.htm"/>
+			<topic label="Converting CDT 1.x Projects" href="tasks/cdt_t_convert_cdt_proj.htm"/>
+			<topic label="Adding Convert to a C/C++ Make Project to the New menu" href="tasks/cdt_t_add_custom_persp.htm"/>
+			<topic label="Set Discovery Options" href="tasks/cdt_t_discovery.htm"/>
 		</topic>
 		<topic label="Write code" href="tasks/cdt_o_write_code.htm">
 			<topic label="Customize the C/C++ editor" href="tasks/cdt_t_cust_cpp_editor.htm"/>
@@ -23,6 +24,7 @@
 			</topic>
 			<topic label="Shift lines of code to the left or right" href="tasks/cdt_t_shift_code.htm"/>
 			<topic label="Search for C/C++ elements" href="tasks/cdt_t_search.htm"/>
+			<topic label="Selection Search for C/C++ elements" href="tasks/cdt_t_sel_search.htm"/>
 			<topic label="Navigate to C/C++ declarations by name" href="tasks/cdt_t_open_declarations.htm"/>
 			<topic label="Refactoring" href="tasks/cdt_t_refactoring.htm"/>
 		</topic>