diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm
old mode 100644
new mode 100755
index a46e6c19c7c..9e54aea839b
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_whatsnew.htm
@@ -134,7 +134,7 @@
 </p>
 <a name="Build"></a><h2> <span class="headline"> Build </span></h2>
 <a name="Scanner_Discovery"></a><h3> <span class="headline"> Scanner Discovery  </span></h3>
-<p>Scanner Discovery has been reworked in this release. The main purpose of Scanner Discovery was always to supply Include Paths and Macros for indexer and build. Now these are supplied by Language Settings Providers. See more at <a href="../../scannerdiscovery61/index.html" class="external text" title="http://wiki.eclipse.org/CDT/ScannerDiscovery61" rel="nofollow">Scanner Discovery Wiki</a>
+<p>Scanner Discovery has been reworked in this release. The main purpose of Scanner Discovery was always to supply Include Paths and Macros for indexer and build. Now these are supplied by Language Settings Providers. See more at <a href="http://wiki.eclipse.org/CDT/ScannerDiscovery61" class="external text">Scanner Discovery</a> on the wiki.
 </p><p><img alt="Image:sd90Entries.png" src="../images/cdt81/sd90entries.png" width="1111" height="736" border="0" />
 </p><p><img alt="Image:sd90Providers.png" src="../images/cdt81/sd90providers.png" width="1177" height="736" border="0" />
 </p><p><br />
@@ -372,7 +372,7 @@
 </li><li>test runs history;
 </li><li>the list of provided tests runners may be easily extended writing a new Tests Runner Plugin.
 </li></ul>
-<p>The HOWTO, known problems and limitation can be found in the <a href="../faq/index.html#C.2FC.2B.2B_Unit_Testing_Support" class="external text" title="http://wiki.eclipse.org/CDT/User/FAQ#C.2FC.2B.2B_Unit_Testing_Support" rel="nofollow">corresponding section of CDT FAQ</a>.
+<p>The HOWTO, known problems and limitation can be found in the <a href="http://wiki.eclipse.org/CDT/User/FAQ#C.2FC.2B.2B_Unit_Testing_Support" class="external text">CDT FAQ</a> on the wiki.
 </p><p>This feature was completed April 18th, 2012 as part of <a href="http://bugs.eclipse.org/210366" class="external text" title="http://bugs.eclipse.org/210366" rel="nofollow">Bug 210366</a>.
 </p>
 <a name="Bugs_Fixed"></a><h2> <span class="headline"> Bugs Fixed in this Release </span></h2>
diff --git a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
old mode 100644
new mode 100755
index d088af93536..50671d14402
--- a/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
+++ b/doc/org.eclipse.cdt.doc.user/contexts_CDT.xml
@@ -147,41 +147,11 @@
    <topic href="reference/cdt_u_discovery_preferences.htm"
    	label="Discovery Options"/>
 </context>
-<context id ="man_prop_info">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_mprop_info.htm"
-   	label="Info"/>
-</context>
-<context id ="man_prop_builder">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_mprop_builders.htm"
-   	label="Builders"/>
-</context>
-<context id ="man_prop_build">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_mprop_build.htm"
-   	label="Build"/>
-</context>
-<context id ="man_prop_file_types">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_mprop_file_types.htm"
-   	label="File Types"/>
-</context>
 <context id ="man_prop_indexer">
    <description>Click below to see help.</description>
    <topic href="reference/cdt_u_prop_general_idx.htm"
    	label="Indexer"/>
 </context>
-<context id ="man_prop_error">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_mprop_merror.htm"
-   	label="Error Parser"/>
-</context>
-<context id ="man_prop_references">
-   <description>Click below to see help.</description>
-   <topic href="reference/cdt_u_mprop_ref.htm"
-   	label="Project References"/>
-</context>
 <context id ="std_prop_info">
    <description>Click below to see help.</description>
    <topic href="reference/cdt_u_sprop_info.htm"
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref.htm
old mode 100644
new mode 100755
index 2f6f6ebd98e..60eb5fd6a68
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mproj_pref.htm
@@ -17,9 +17,6 @@ entire workspace.</p>
 <img src="../images/mpref.png" width="580" height="525" alt="Managed Build preference page"></p>
 <p style="margin-top: 0">The following settings may be customized:</p>
 <ul>
-	<li>
-	<p style="margin-top: 0"><a href="cdt_o_mproj_pref_env.htm">Build 
-	Environment Settings</a></li>
 <li>
 <p style="margin-top: 0"><a href="cdt_o_mproj_pref_macro.htm">Build Macros 
 Settings</a></li>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm
old mode 100644
new mode 100755
index 9c22813f53b..39d28a3c246
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm
@@ -33,9 +33,8 @@ configuration.</dd>
 <a href="cdt_u_mfile_tool_settings.htm">C++ Project Properties, Managed
 Make File, C/C++ Build, Tool Settings</a><br>
 <a href="cdt_u_mfile_info.htm">C++ Project Properties, Managed Make
-File, Info</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++
-Build</a></p>
+File, Info</a>
+</p>
 <p>
 <img src="../images/ng00_04a.gif" alt="IBM Copyright Statement"> </p>
 </div></body>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_info.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_info.htm
old mode 100644
new mode 100755
index 1bd158d2144..59b3e11ec3a
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_info.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_info.htm
@@ -27,8 +27,7 @@
 <p><img src="../images/ngref.gif" alt="Related reference"
  width="143" height="21"><br>
 <a href="cdt_u_mfile_build.htm">C++ Project Properties, Managed Make
-File, C/C++ Build</a><br>
-<a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a></p>
+File, C/C++ Build</a></p>
 <p>
 <img src="../images/ng00_04a.gif" alt="IBM Copyright Statement"> </p>
 </div></body>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_rcbs.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_rcbs.htm
old mode 100644
new mode 100755
index 2651d23743f..ab7b21c3c7f
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_rcbs.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_rcbs.htm
@@ -58,9 +58,7 @@ configuration.</dd>
 <p><img src="../images/ngref.gif" alt="Related reference"
  width="143" height="21"><br>
 <a href="cdt_u_mfile_info.htm">C++ Project Properties, Managed Make
-File, Info</a><br>
-<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
-Managed, C/C++ Build, Tool Settings</a></p>
+File, Info</a></p>
 <p><img src="../images/intl_05.gif" ALT="Intel Copyright Statement" ></p>
 </div></body>
 </html>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm
old mode 100644
new mode 100755
index 7716667fefd..0fde36fd589
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm
@@ -31,9 +31,7 @@ configuration.</dd>
 <p><img src="../images/ngref.gif" alt="Related reference"
  width="143" height="21"><br>
 <a href="cdt_u_mfile_info.htm">C++ Project Properties, Managed Make
-File, Info</a><br>
-<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties,
-Managed, C/C++ Build, Tool Settings</a></p>
+File, Info</a></p>
 <p>
 <img src="../images/ng00_04a.gif" alt="IBM Copyright Statement"> </p>
 </div></body>