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 7862a3fa9cf..cc3b62c76b9 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
@@ -1,51 +1,58 @@
 <!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++ Indexer Progress Bar</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
+  <meta content="en-us" http-equiv="Content-Language">
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type">
+  <title>C/C++ Indexer Progress Bar</title>
+  <link href="../help.css" type="text/css" rel="stylesheet">
 </head>
-
 <body>
-
 <h1>C/C++ Indexer Progress Bar</h1>
-
-<p>The indexer progress bar shows the progress status of the indexing jobs in the progress views.</p>
-
-<p>The indexing jobs can be temporarily paused by pressing the stop button on the progress bar.  
-This will cause the indexer to wait until the next time the user runs a search job or makes a change to an indexed element 
-(by such actions as modifying an existing source file, deleting a file, creating a new file, moving file and so on). 
-The indexer at this point will resume with the previously postponed indexing job before moving on to the new one.</p>
-
-<p>If you wish to cease indexing all together, you can cancel an indexing job and disable the indexer through the properties.</p>
-
-<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
+<p>The indexer progress bar shows the progress status of the indexing
+jobs in the progress views.</p>
+<p>The indexing jobs can be temporarily paused by pressing the stop
+button on the progress bar. This will cause the indexer to wait until
+the next time the user runs a search job or makes a change to an
+indexed element (by such actions as modifying an existing source file,
+deleting a file, creating a new file, moving file and so on). The
+indexer at this point will resume with the previously postponed
+indexing job before moving on to the new one.</p>
+<p>If you wish to cease indexing all together, you can cancel an
+indexing job and disable the indexer through the properties.</p>
+<p><img height="21" width="143" alt="Related concepts"
+ src="../images/ngconcepts.gif" border="0">
 <br>
 <a href="cdt_c_search.htm">C/C++ search</a><br>
 <a href="cdt_c_indexer.htm">C/C++ Indexer</a><br>
-<a href="cdt_c_indexer_prob_rep.htm">C/C++ Indexer Problem Reporting</a><br>
-<a href="cdt_c_indexer_open_close.htm">C/C++ Indexer Opening or Closing a project</a></p>
-
-
-<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" 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_endis_indexer.htm">Enable/Disable the C/C++ Indexer</a><br>
-<a href="../tasks/cdt_t_indexer_prob_rep.htm">C/C++ Indexer Problem Reporting</a><br>
-<a href="../tasks/cdt_t_indexer_timeout.htm">C/C++ Indexer - Indexer Timeout</a><br>
+<a href="cdt_c_indexer_fullindexer.htm">Full C/C++ Indexer</a><br>
+<a href="cdt_c_indexer_ctagsindexer.htm">CTags Indexer</a><br>
+<a href="cdt_c_indexer_open_close.htm">C/C++ Indexer Opening or Closing
+a project</a></p>
+<p><img height="21" width="143" alt="Related tasks"
+ src="../images/ngtasks.gif" border="0"><br>
+<a href="../tasks/cdt_t_sel_search.htm">Selection Searching for C/C++
+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>
 <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><a href="../reference/cdt_u_mprop_indexer.htm">C/C++ Project Properties, Managed, Indexer</a>
-<br><a href="../reference/cdt_u_sprop_indexer.htm">C/C++ Project Properties, Standard, Indexer</a></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>
+<a href="../reference/cdt_u_mprop_indexer.htm">C/C++ Project
+Properties, Managed, Indexer</a>
+<br>
+<a href="../reference/cdt_u_sprop_indexer.htm">C/C++ Project
+Properties, Standard, Indexer</a></p>
 <p>&nbsp;</p>
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
+<img alt="IBM Copyright Statement" src="../images/ng00_04a.gif">
 </body>
-
-</html>
\ No newline at end of file
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablectags.html b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablectags.html
index 8c098852ddf..b1802eeda36 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablectags.html
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablectags.html
@@ -137,7 +137,8 @@ Bar</a></p>
 <a href="../tasks/cdt_t_sel_search.htm">Selection Searching for C/C++
 elements</a><br>
 <a href="cdt_t_indexer_enablefull.htm">Enable/Disable the Full C/C++
-Indexer</a><a href="../tasks/cdt_t_indexer_timeout.htm"></a><br>
+Indexer</a><br>
+<a href="indexer_importing_large_project.html">Importing a large project</a><br>
 <a href="../tasks/cdt_t_set_src_fold.htm">Setting Source Folders</a><br>
 </p>
 <p><img style="border: 0px solid ; width: 143px; height: 21px;"
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablefull.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablefull.htm
index 6e446c62819..549069b3c53 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablefull.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_indexer_enablefull.htm
@@ -94,6 +94,7 @@ Bar</a></p>
 elements</a><br>
 <a href="cdt_t_indexer_enablectags.html">Enable/Disable the CTags
 Indexer</a><br>
+<a href="indexer_importing_large_project.html">Importing a large project</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"
