diff --git a/doc/org.eclipse.cdt.doc.user/images/C-C++Preferences.png b/doc/org.eclipse.cdt.doc.user/images/C-C++Preferences.png
deleted file mode 100644
index 40bd9aa5cd3..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/C-C++Preferences.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/build_make_targets.png b/doc/org.eclipse.cdt.doc.user/images/build_make_targets.png
deleted file mode 100644
index df8c06d85a4..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/build_make_targets.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/build_manage.png b/doc/org.eclipse.cdt.doc.user/images/build_manage.png
deleted file mode 100644
index 482cd9c655f..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/build_manage.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/build_order.png b/doc/org.eclipse.cdt.doc.user/images/build_order.png
deleted file mode 100644
index 3ba1f1debf9..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/build_order.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/builder_settings.png b/doc/org.eclipse.cdt.doc.user/images/builder_settings.png
new file mode 100644
index 00000000000..526e58fe3f9
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/builder_settings.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_autobuild.png b/doc/org.eclipse.cdt.doc.user/images/cdt_autobuild.png
new file mode 100644
index 00000000000..85e53202698
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_autobuild.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_menu_help.png b/doc/org.eclipse.cdt.doc.user/images/cdt_menu_help.png
deleted file mode 100644
index 4dcceb7eabf..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_menu_help.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/edit_menu.png b/doc/org.eclipse.cdt.doc.user/images/edit_menu.png
deleted file mode 100644
index 3aeb991fd92..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/edit_menu.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/new_make-binary_parser.png b/doc/org.eclipse.cdt.doc.user/images/new_make-binary_parser.png
deleted file mode 100644
index 080a0947d3c..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/new_make-binary_parser.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/new_make-builder.png b/doc/org.eclipse.cdt.doc.user/images/new_make-builder.png
deleted file mode 100644
index 40e3345dfd9..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/new_make-builder.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/project_references.png b/doc/org.eclipse.cdt.doc.user/images/project_references.png
deleted file mode 100644
index fe0d6f3dfb9..00000000000
Binary files a/doc/org.eclipse.cdt.doc.user/images/project_references.png and /dev/null differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/task_binary_parser.png b/doc/org.eclipse.cdt.doc.user/images/task_binary_parser.png
new file mode 100644
index 00000000000..b55a5a74644
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/task_binary_parser.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/task_binary_pref.png b/doc/org.eclipse.cdt.doc.user/images/task_binary_pref.png
new file mode 100644
index 00000000000..fdd8fc45e44
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/task_binary_pref.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/workbench_prop.png b/doc/org.eclipse.cdt.doc.user/images/workbench_prop.png
index d674b478475..e7105692af3 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/workbench_prop.png and b/doc/org.eclipse.cdt.doc.user/images/workbench_prop.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
index b679cd4788e..031cec6a41a 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
@@ -12,14 +12,11 @@
 <h1>Building projects</h1>
 <p>This sections explains how to build your project and manage compile errors.</p>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_rename.htm">Renaming a project</a><br>
-	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_ref.htm">Selecting referenced projects</a><br>
-	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_build_set.htm">Defining Standard Make build settings</a><br>
-	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_mproj_build_set.htm">Defining Managed Make build settings</a><br>
+	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_build_set.htm">Defining build settings</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_error_parser.htm">Filtering errors</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_parser.htm">Selecting a binary parser</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_paths.htm">Adding Include paths and symbols</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_platf.htm">Selecting a project type</a><br>
-	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_setbuildorder.htm">Setting build order</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_manualbuild.htm">Building Manually</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_autobuild.htm">Removing Build Automatically</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_autosave.htm">Autosaving on a build</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm
index ec3899543ec..b676e8d4e62 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm
@@ -14,7 +14,7 @@ otherwise your entire project will be rebuilt whenever, for example,
 you save a change to your makefile or source files.
 Click <b>Project &gt; Build Automatically</b> and ensure there is no
 checkmark beside the <b>Build Automatically</b> menu item.</p>
-<p><img src="../images/cdt_menu_project.png"
+<p><img src="../images/cdt_autobuild.png"
  alt="Menubar showing Project selection"></p>
 <p><img border="0" src="../images/ngconcepts.gif" alt="Related concepts"
  width="143" height="21">
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_mproj_build_set.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_mproj_build_set.htm
deleted file mode 100644
index 128e0df1434..00000000000
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_mproj_build_set.htm
+++ /dev/null
@@ -1,57 +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 http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Defining Managed Make build settings</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-
-<h1>Defining Managed Make build settings</h1>
-
-<p>The <b>C/C++ Build</b> property page of a Managed Make project allows you to:</p>
-
-<ul>
-  <li>Add, remove and rename build configurations</li>
-  <li>Change the command line options used when invoking the build tools</li>
-  <li>Change the name of the final output of the build</li>
-  <li>Change the make command used to invoke the build</li>
-  <li>Select to use the Internal Builder instead of the external builder</li>
-  <li>Add custom build steps to the build</li>
-  <li>Define the error parsers to be used to filter the build error messages - See <b>Filtering errors</b>.</li>
-  <li>Define the binary parser used with the output of the build - See <b>Selecting a binary parser</b>.</li>
-  <li>Define the environment variables for the build</li>
-  <li>Define build macros for the build</li>
-</ul>
-
-See <a href="../reference/cdt_u_properties.htm">C/C++ Project Properties</a> for further information.
-
-<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
-<br>
-  <a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
-  <a href="../concepts/cdt_c_proj_file_views.htm">Project file views</a></p>
-<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
-<br>
-
-<a href="cdt_o_proj_files.htm">Working with C/C++ project files</a></p>
-<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
-<br>
-<a href="../reference/cdt_u_properties.htm">C/C++ Project Properties</a></p>
-<a href="../reference/cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
-<a href="../reference/cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
-<a href="../reference/cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
-<a href="../reference/cdt_u_mprop_dcbs.htm">C++ Project Properties, Managed, C/C++ Build, Build Steps</a><br>
-<a href="../reference/cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
-<a href="../reference/cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
-<a href="../reference/cdt_u_mprop_env.htm">C++ Project Properties, Managed, C/C++ Build, Environment</a><br>
-<a href="../reference/cdt_u_mprop_macros.htm">C++ Project Properties, Managed, C/C++ Build, Macros</a><br>
-</p>
-
-<img src="../images/ng00_05a.gif" ALT="IBM Copyright Statement" >
-
-</body>
-
-</html>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm
index 0da3cb4d910..d2638e5b2de 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm
@@ -3,57 +3,33 @@
 <head>
   <meta http-equiv="Content-Language" content="en-us">
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>Defining Standard Make build settings</title>
+  <title>Defining Project Build settings</title>
   <link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h1>Defining Standard Make build settings</h1>
-<p>The <b>Make Builder</b> page lets you:</p>
+<h1>Defining Project Build settings</h1>
+<p>The <b>Builder Settings</b> page lets you:</p>
 <ul>
+  <li>Select whether CDT-generated makefile should be used or custom one.</li>
+  <li>Select internal or external builder (for generated makefile only).</li>
+  <li>Change the default build command (for external builder or for custom makefile).</li>
   <li>Configure how the CDT handles make errors.</li>
-  <li>Change the default build command.</li>
+  <li>Change parallel build settings.</li> 
   <li>Map the target passed to make when you select build or rebuild.</li>
+  <li>Redefine duild directory (for custom makefile only)</li>
 </ul>
-<p>You can define the properties on a per project basis in the New
-Project wizard, in the C/C++ Projects view or in the Navigator view.
-You can also define project properties in the Preferences window for
-future standard make projects.</p>
-<p>Before you begin</p>
-<p>In order to be able to turn on or to turn off the feature that
-automatically performs an incremental build of your project every time
-a resource is saved for individual projects, you need to enable the
-Workbench <b>Build Automatically</b> preference. You can then disable
-this feature or change the associated make target for individual
-projects.</p>
-<p>To enable build on resource save:</p>
-<ol>
-  <li>Click <b>Window &gt; Preferences</b>.</li>
-  <li>To automatically perform an incremental build of your project
-every time a resource is saved, select <b>Workbench</b> from the list.</li>
-  <li>Select the <b>Perform build automatically on resource
-modification</b> check box. <br>
-Note: this is the default setting.</li>
-  <p>You can now enable or disable this feature on a per project basis.</p>
-</ol>
-<p>To define build settings:</p>
-<p><img src="../images/new_make-builder.png"
- alt="Windows Preference Make Builder dialog"></p>
-<ol>
-  <li>Do one of the following:</li>
-  <ul>
-    <li>Click <b>Window &gt; Preferences</b>. Expand<b> C/C++</b>,
-click <b> New Make Projects</b>.</li>
-    <li>In the C/C++ Projects view, right-click a standard make
-project, and select <b>Properties</b>. Select <b>C/C++ Make Project</b>
-from the list.</li>
-  </ul>
-  <li>Click the <b>Make Builder</b> tab.</li>
-</ol>
-<ol style="list-style-type: decimal;" start="3">
+
+<p>To define build settings:<br>
+In the C/C++ Projects view, right-click your project, and select <b>Properties</b>. 
+Select <b>C/C++ Build </b> from the list.</li>
+</p>
+
+<p><img src="../images/builder_settings.png"
+ alt="Defining Project Build settings"></p>
+
+<ul>
   <li>To stop the build when an error is encountered, select <b>Stop
 on first build error</b>.</li>
-</ol>
-<ol style="list-style-type: decimal;" start="4">
   <li>Select one of the following build command settings:</li>
   <ul>
     <li>To use the default make command, select the <b>Use Default</b>
@@ -75,7 +51,7 @@ build target</b> box.</li>
 build target</b> box.</li>
   </ul>
   <li>Click <span style="font-weight: bold;">OK</span>.</li>
-</ol>
+</ul>
 <p><img border="0" src="../images/ngconcepts.gif" alt="Related concepts"
  width="143" height="21"><br>
 <a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
@@ -84,11 +60,6 @@ build target</b> box.</li>
  width="143" height="21">
 <br>
 <a href="cdt_o_proj_files.htm">Working with C/C++ project files</a></p>
-<p><img border="0" src="../images/ngref.gif" alt="Related reference"
- width="143" height="21">
-<br>
-<a href="../reference/cdt_u_newproj_buildset.htm">Make Builder page,
-C/C++ Properties window</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_proj_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
index 18d8cf25cfa..f7df57574a6 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_parser.htm
@@ -16,16 +16,16 @@ correct parser for your development environment and build your project,
 you can view the components of the .o file in the C/C++ Projects view
 and view the contents of the .o file in the C/C++ editor. You can also
 easily browse for the executable when defining run/debug configurations.</p>
-<p>For a Standard Make project, you can define the properties on a per
-project basis from the New Project wizard, in the C/C++ Projects view
-or in the Navigator view. You can also define project properties in the
-Preferences window for future standard make projects.</p>
-<p>To set properties for future Standard Make projects:</p>
+<p>If you use CDT-generated makefile to build your project, appropriate
+binary parsers are set according to selected toolchain during creation.</p>
+<p>If you use your own makefile to build, default settings 
+for binary parser are got from Preferences during project creation.</p>
+<p>You can modify these settings in the Preferences window, to be used in future projects.</p>
+<p>To set properties for future projects with user-provided Makefile :</p>
 <ol>
-  <li>Click <b>Window &gt; Preferences </b>. Expand<b> C/C++,</b>
-click <b>New Make Projects</b>.</li>
+  <li>Click <b>Window &gt; Preferences &gt; C/C++ &gt; New CDT Project wizard &gt; Makefile project</b></li>
   <li>Click the <b>Binary Parser</b> tab.<br>
-    <img src="../images/new_make-binary_parser.png"
+    <img src="../images/task_binary_pref.png"
  alt="Select Binary Parser window"></li>
   <li>In the <b>Binary Parser</b> list, click:</li>
   <ul>
@@ -35,12 +35,16 @@ click <b>New Make Projects</b>.</li>
   </ul>
   <li>Click <b>OK</b>.</li>
 </ol>
-<p>For a Managed Make project:</p>
+<p>To change binary parsers for existing project:</p>
 <ol>
   <li>In the C/C++ Projects view, right-click the project, and select <b>Properties</b>.</li>
-  <li>Select <b>C/C++ Build</b> from the list.</li>
-  <li>Click the <b>Binary Parser</b> tab.</li>
+  <li>Select <b>C/C++ Build &gt; Settings</b> from the list.</li>
+  <li>Click the <b>Binary Parser</b> tab.<br>
+<img src="../images/task_binary_parser.png"
+ alt="Select Binary Parser window">
+  </li>
 </ol>
+<br>
 <p><img border="0" src="../images/ngconcepts.gif" alt="Related concepts"
  width="143" height="21"><br>
 <a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_ref.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_ref.htm
deleted file mode 100644
index b1210dfeb45..00000000000
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_ref.htm
+++ /dev/null
@@ -1,43 +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 http-equiv="Content-Type" content="text/html; charset=UTF-8">
-  <title>Selecting referenced projects</title>
-  <link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-<body>
-<h1>Selecting referenced projects</h1>
-<p>The Referenced C/C++ Projects list on the Projects References page
-for a given project displays every project in your workspace in the
-build order you specify. For more information, see <a
- href="cdt_t_setbuildorder.htm">Setting build order</a>.</p>
-<p>Projects selected in the list are built before the current project
-according to their dependencies. The least used projects are built
-first.</p>
-<p>To select referenced projects:</p>
-<ol>
-  <li>In the C/C++ Projects view, right-click a project, and select <b>Properties</b>.<br>
-    <img src="../images/project_properties.png"
- alt="Project Properties menu"></li>
-  <li>On the left, select <b>Project References</b> from the list.</li>
-  <li>In the Project references... list, select referenced projects..<br>
-    <img src="../images/project_references.png"
- alt="Project References dialog box"></li>
-  <li>Click <b>OK</b>.</li>
-</ol>
-<p><img border="0" src="../images/ngconcepts.gif" alt="Related concepts"
- width="143" height="21"><br>
-<a href="../concepts/cdt_c_projects.htm">CDT Projects</a><br>
-<a href="../concepts/cdt_c_proj_file_views.htm">Project file views</a></p>
-<p><img border="0" src="../images/ngtasks.gif" alt="Related tasks"
- width="143" height="21">
-<br>
-<a href="cdt_o_proj_files.htm">Working with C/C++ project files</a></p>
-<p><img border="0" src="../images/ngref.gif" alt="Related reference"
- width="143" height="21">
-<br>
-<a href="../reference/cdt_o_proj_prop_pages.htm">Project properties</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_setbuildorder.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setbuildorder.htm
deleted file mode 100644
index a8ffe8cace3..00000000000
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_setbuildorder.htm
+++ /dev/null
@@ -1,62 +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 http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Setting build order</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
-</head>
-
-<body>
-
-<h1>Setting build order</h1>
-
-<p>You can specify the order in which projects are built. 
-Referenced projects are built first.</p>
-
-<p>When you set the build order, the CDT does not rebuild projects that depend 
-on a project. You must rebuild all projects to ensure  changes are 
-propagated.</p>
-
-<p>For more information on build order, see <b>Workbench User Guide &gt; Reference 
-&gt; Preference &gt; Build Order</b>.</p>
-
-<p>To set the project build order:</p>
-
-<ol>
-  <li>Click <b>Window &gt; Preferences</b>.</li>
-  <li>Select <b>Build Order</b> from the list.<br>
-  <img src="../images/build_order.png" alt="Build Order Preference Window.">
-  </li>
-  <li>Clear the <b>Use default build order</b> checkbox. </li>
-  <li>Select a project in the list.</li>
-  <li>Do one of the following:</li>
-  <ul><li>Click <b>Up</b> to move the project up the list.</li>
-  <li>Click <b>Down</b> to move the project down the list.</li></ul>
-  <li>To add projects to the build path, click <b>Add Project</b>.</li>
-  <li>Select the projects to add to the build order list.</li>
-  <li>Click <b>OK</b>.</li>
-  <li>To remove a project from the Project build order list, click <b>Remove 
-  Project</b>.</li>
-  <p>When building or rebuilding all projects, the projects that have been 
-  removed from the build order are built last.</p>
-  <li>Click  <b>Apply</b>.</li>
-</ol>
-
-<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
-<br>
-<a href="../concepts/cdt_c_build_over.htm">Build overview</a></p>
-<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
-<br>
-<a href="cdt_t_proj_build_set.htm">Defining build settings</a><br>
-<a href="cdt_o_build_task.htm">Building</a></p>
-<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
-<br>
-<a href="../reference/cdt_u_newproj_buildset.htm">Make Builder page, C/C++ Properties window</a></p>
-
-<img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" >
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index b035224a97b..c00be683927 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -30,14 +30,11 @@
 		</topic>
 		<topic label="Building projects" href="tasks/cdt_o_build_task.htm">
 			<topic label="Renaming a project" href="tasks/cdt_t_proj_rename.htm"/>
-			<topic label="Selecting referenced projects" href="tasks/cdt_t_proj_ref.htm"/>
-			<topic label="Defining Standard Make build settings" href="tasks/cdt_t_proj_build_set.htm"/>
-			<topic label="Defining Managed Make build settings" href="tasks/cdt_t_mproj_build_set.htm"/>
+			<topic label="Defining build settings" href="tasks/cdt_t_proj_build_set.htm"/>
 			<topic label="Filtering Errors" href="tasks/cdt_t_proj_error_parser.htm"/>
 			<topic label="Selecting a binary parser" href="tasks/cdt_t_proj_parser.htm"/>
 			<topic label="Adding Include paths and symbols" href="tasks/cdt_t_proj_paths.htm"/>
 			<topic label="Selecting a project type" href="tasks/cdt_t_proj_platf.htm"/>
-			<topic label="Setting build order" href="tasks/cdt_t_setbuildorder.htm"/>
 			<topic label="Building Manually" href="tasks/cdt_t_manualbuild.htm"/>
 			<topic label="Removing Build Automatically" href="tasks/cdt_t_autobuild.htm"/>
 			<topic label="Autosaving on a build" href="tasks/cdt_t_autosave.htm"/>