diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm
index 71c23e7bb27..fa65ecbdf7d 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic.htm
@@ -7,10 +7,10 @@
 
 <script language="JavaScript">
 var first = 0;
-var last = 22;
+var last = 21;
 var position = 0;
 
-var cdt_w_basicText= new Array(23) 
+var cdt_w_basicText= new Array(22) 
 cdt_w_basicText[0]='cdt_w_basic01.htm';
 cdt_w_basicText[1]='cdt_w_basic02.htm';
 cdt_w_basicText[2]='cdt_w_basic03.htm';
@@ -18,25 +18,24 @@ cdt_w_basicText[3]='cdt_w_basic04.htm';
 cdt_w_basicText[4]='cdt_w_basic05.htm';
 cdt_w_basicText[5]='cdt_w_basic06.htm';
 cdt_w_basicText[6]='cdt_w_basic07.htm';
-cdt_w_basicText[7]='cdt_w_basic08.htm';
-cdt_w_basicText[8]='cdt_w_basic09.htm';
-cdt_w_basicText[9]='cdt_w_basic10.htm';
-cdt_w_basicText[10]='cdt_w_basic11.htm';
-cdt_w_basicText[11]='cdt_w_basic12.htm';
-cdt_w_basicText[12]='cdt_w_basic13.htm';
-cdt_w_basicText[13]='cdt_w_basic14.htm';
-cdt_w_basicText[14]='cdt_w_basic15.htm';
-cdt_w_basicText[15]='cdt_w_basic16.htm';
-cdt_w_basicText[16]='cdt_w_basic17.htm';
-cdt_w_basicText[17]='cdt_w_basic18.htm';
-cdt_w_basicText[18]='cdt_w_basic19.htm';
-cdt_w_basicText[19]='cdt_w_basic20.htm';
-cdt_w_basicText[20]='cdt_w_basic21.htm';
-cdt_w_basicText[21]='cdt_w_basic22.htm';
-cdt_w_basicText[22]='cdt_w_basic23.htm';
+cdt_w_basicText[7]='cdt_w_basic09.htm';
+cdt_w_basicText[8]='cdt_w_basic10.htm';
+cdt_w_basicText[9]='cdt_w_basic11.htm';
+cdt_w_basicText[10]='cdt_w_basic12.htm';
+cdt_w_basicText[11]='cdt_w_basic13.htm';
+cdt_w_basicText[12]='cdt_w_basic14.htm';
+cdt_w_basicText[13]='cdt_w_basic15.htm';
+cdt_w_basicText[14]='cdt_w_basic16.htm';
+cdt_w_basicText[15]='cdt_w_basic17.htm';
+cdt_w_basicText[16]='cdt_w_basic18.htm';
+cdt_w_basicText[17]='cdt_w_basic19.htm';
+cdt_w_basicText[18]='cdt_w_basic20.htm';
+cdt_w_basicText[19]='cdt_w_basic21.htm';
+cdt_w_basicText[20]='cdt_w_basic22.htm';
+cdt_w_basicText[21]='cdt_w_basic23.htm';
 
 
-var cdt_w_basicPic= new Array(23) 
+var cdt_w_basicPic= new Array(22) 
 cdt_w_basicPic[0]='../images/cdt_w_basic01.png';
 cdt_w_basicPic[1]='../images/cdt_w_basic02.png';
 cdt_w_basicPic[2]='../images/cdt_w_basic03.png';
@@ -44,24 +43,23 @@ cdt_w_basicPic[3]='../images/cdt_w_basic04.png';
 cdt_w_basicPic[4]='../images/cdt_w_basic05.png';
 cdt_w_basicPic[5]='../images/cdt_w_basic06.png';
 cdt_w_basicPic[6]='../images/cdt_w_basic07.png';
-cdt_w_basicPic[7]='../images/cdt_w_basic08.png';
-cdt_w_basicPic[8]='../images/cdt_w_basic09.png';
-cdt_w_basicPic[9]='../images/cdt_w_basic10.png';
-cdt_w_basicPic[10]='../images/cdt_w_basic11.png';
-cdt_w_basicPic[11]='../images/cdt_w_basic12.png';
-cdt_w_basicPic[12]='../images/cdt_w_basic13.png';
-cdt_w_basicPic[13]='../images/cdt_w_basic14.png';
-cdt_w_basicPic[14]='../images/cdt_w_basic15.png';
-cdt_w_basicPic[15]='../images/cdt_w_basic16.png';
-cdt_w_basicPic[16]='../images/cdt_w_basic17.png';
-cdt_w_basicPic[17]='../images/cdt_w_basic18.png';
-cdt_w_basicPic[18]='../images/cdt_w_basic19.png';
-cdt_w_basicPic[19]='../images/cdt_w_basic20.png';
-cdt_w_basicPic[20]='../images/cdt_w_basic21.png';
-cdt_w_basicPic[21]='../images/cdt_w_basic22.png';
-cdt_w_basicPic[22]='../images/cdt_w_basic23.png';
+cdt_w_basicPic[7]='../images/cdt_w_basic09.png';
+cdt_w_basicPic[8]='../images/cdt_w_basic10.png';
+cdt_w_basicPic[9]='../images/cdt_w_basic11.png';
+cdt_w_basicPic[10]='../images/cdt_w_basic12.png';
+cdt_w_basicPic[11]='../images/cdt_w_basic13.png';
+cdt_w_basicPic[12]='../images/cdt_w_basic14.png';
+cdt_w_basicPic[13]='../images/cdt_w_basic15.png';
+cdt_w_basicPic[14]='../images/cdt_w_basic16.png';
+cdt_w_basicPic[15]='../images/cdt_w_basic17.png';
+cdt_w_basicPic[16]='../images/cdt_w_basic18.png';
+cdt_w_basicPic[17]='../images/cdt_w_basic19.png';
+cdt_w_basicPic[18]='../images/cdt_w_basic20.png';
+cdt_w_basicPic[19]='../images/cdt_w_basic21.png';
+cdt_w_basicPic[20]='../images/cdt_w_basic22.png';
+cdt_w_basicPic[21]='../images/cdt_w_basic23.png';
 
-var screenText= new Array(23) 
+var screenText= new Array(22) 
 screenText[0]='Eclipse Workbench';
 screenText[1]='Opening the C/C++ Perspective';
 screenText[2]='The C++ Perspective';
@@ -69,22 +67,21 @@ screenText[3]='Creating a New Project';
 screenText[4]='New Project Wizard';
 screenText[5]='New Managed Make C++ Project';
 screenText[6]='Select a Target';
-screenText[7]='Error Parser Configuration';
-screenText[8]='C/C++ Indexer Configuration';
-screenText[9]='New C++ Project in the Workbench';
-screenText[10]='Create a New File';
-screenText[11]='New File Wizard';
-screenText[12]='New File in the Workbench';
-screenText[13]='Entering Code in the New .cpp File';
-screenText[14]='Stepping Through the Code in Outline View';
-screenText[15]='Save the File';
-screenText[16]='Displaying New Executables in the Projects View';
-screenText[17]='Selecting Run from the Menu';
-screenText[18]='Run Wizard';
-screenText[19]='Selecting the Program to Run';
-screenText[20]='Run Configuration';
-screenText[21]='Console View with Program Running';
-screenText[22]='Console View with Program Terminated';
+screenText[7]='C/C++ Indexer Configuration';
+screenText[8]='New C++ Project in the Workbench';
+screenText[9]='Create a New File';
+screenText[10]='New File Wizard';
+screenText[11]='New File in the Workbench';
+screenText[12]='Entering Code in the New .cpp File';
+screenText[13]='Stepping Through the Code in Outline View';
+screenText[14]='Save the File';
+screenText[15]='Displaying New Executables in the Projects View';
+screenText[16]='Selecting Run from the Menu';
+screenText[17]='Run Wizard';
+screenText[18]='Selecting the Program to Run';
+screenText[19]='Run Configuration';
+screenText[20]='Console View with Program Running';
+screenText[21]='Console View with Program Terminated';
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic07.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic07.htm
index 15620309432..4df9a0d7bae 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic07.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic07.htm
@@ -7,8 +7,8 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Select a Target</h3>
-<p>Select the Executable Build Target, appropriate for your operating system.</p>
+<h3>Select a Project Type</h3>
+<p>Select the type of project that you want to build, and the default configurations to be created.</p>
 <p>Click <b>Next</b>.</p>
 
 </body>
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic07.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic07.png
index 7b43c2846f1..ed11ac72647 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic07.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic07.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic09.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic09.png
index ece6b36a678..f7f9da37d73 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic09.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic09.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_binaryp.png b/doc/org.eclipse.cdt.doc.user/images/mprop_binaryp.png
index 84cef88dff8..b5d385c67ea 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_binaryp.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_binaryp.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_build.png b/doc/org.eclipse.cdt.doc.user/images/mprop_build.png
index e7d07328f86..b342784f9e1 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_build.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_build.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_build_settings.png b/doc/org.eclipse.cdt.doc.user/images/mprop_build_settings.png
new file mode 100644
index 00000000000..dfba9034851
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/mprop_build_settings.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_builders.png b/doc/org.eclipse.cdt.doc.user/images/mprop_builders.png
index b906938cb85..186a1a17a3f 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_builders.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_builders.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_errorp.png b/doc/org.eclipse.cdt.doc.user/images/mprop_errorp.png
index fa1b4caba1f..bc86d45471c 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_errorp.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_errorp.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_file_types.png b/doc/org.eclipse.cdt.doc.user/images/mprop_file_types.png
index 105904578b8..791fd734223 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_file_types.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_file_types.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_indexer.png b/doc/org.eclipse.cdt.doc.user/images/mprop_indexer.png
index 128b282a397..63e269c1bbc 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_indexer.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_indexer.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_info.png b/doc/org.eclipse.cdt.doc.user/images/mprop_info.png
index 3bd2565ee67..dcb7590047c 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_info.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_info.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/mprop_proref.png b/doc/org.eclipse.cdt.doc.user/images/mprop_proref.png
index 451d440c387..f1a2e973bdb 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/mprop_proref.png and b/doc/org.eclipse.cdt.doc.user/images/mprop_proref.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_indexer.png b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_indexer.png
index f9e8898026b..94f577886c8 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_indexer.png and b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_indexer.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_proj.png b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_proj.png
index aaad99e8470..6fd1ae06321 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_proj.png and b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_proj.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_target.png b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_target.png
index f48cc964e69..de221f26abe 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_target.png and b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_man_target.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/update_managed_build.png b/doc/org.eclipse.cdt.doc.user/images/update_managed_build.png
index 7e3c4356b9b..724b8337c34 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/update_managed_build.png and b/doc/org.eclipse.cdt.doc.user/images/update_managed_build.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_proj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_proj.htm
index ea18a25cbef..8e6816dae78 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_mmake_proj.htm
@@ -14,10 +14,17 @@
 <p>This section describes properties for a Managed make project.</p>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_info.htm">Info</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_builders.htm">Builders</a><br>
-		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_build.htm">Build</a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_build.htm">C/C++ Build</a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt="">&nbsp;&nbsp;&nbsp;
+<a style="text-decoration:none" href="cdt_u_mprop_tool_settings.htm">Tool Settings</a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt="">&nbsp;&nbsp;&nbsp;
+<a style="text-decoration:none" href="cdt_u_mprop_build_settings.htm">Build Settings </a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt="">&nbsp;&nbsp;&nbsp;
+<a style="text-decoration:none" href="cdt_u_mprop_merror.htm">Error Parsers</a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt="">&nbsp;&nbsp;&nbsp;
+<a style="text-decoration:none" href="cdt_u_mprop_mbinary.htm">Binary Parser</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_file_types.htm">File Types</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_indexer.htm">Indexer</a><br>
-		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_merror.htm">Error Parser</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_ref.htm">Project References</a><br>
 	
 <p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
index f16a102bbe5..057c9396deb 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_new_mproj.htm
@@ -13,9 +13,9 @@
 <h1>C/C++ New Project Wizard, Managed Make Project</h1>
 <p>This section describes properties for creating a Managed make project in the <b>C/C++ New Project Wizard</b>.</p>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_name.htm">Name</a><br>
-		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_target.htm">Select a Target</a><br>
+		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_target.htm">Select a 
+Project Type</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_proj.htm">Referenced Projects</a><br>
-		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_errorp.htm">Error Parsers</a><br>
 		<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_cindexer.htm">C/C++ Indexer</a><br>
 
 	
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 901f521a7d7..c7812a31bf3 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
@@ -68,11 +68,13 @@
 	<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>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_builders.htm">Builders</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_build.htm">Build</a><br>
+		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_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_mprop_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_mprop_build_settings.htm">Build Settings</a><br>
+			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_merror.htm">Error Parser</a><br>
+			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_mbinary.htm">Binary Parser</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_file_types.htm">File Types</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_indexer.htm">Indexer</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_merror.htm">Error Parser</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_mbinary.htm">Binary Parser</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mprop_ref.htm">Project References</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>
@@ -95,9 +97,9 @@
 <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz.htm">C/C++ New Project Wizard</a><br>
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_new_mproj.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_new_proj_wiz_m_name.htm">Name</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_target.htm">Select a Target</a><br>
+		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_target.htm">Select a 
+Project Type</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_proj.htm">Referenced Projects</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_errorp.htm">Error Parsers</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_new_proj_wiz_m_cindexer.htm">C/C++ Indexer</a><br>
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_new_sproj.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_new_proj_wiz_s_name.htm">Name</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm
index cab144ec4cf..21087cc0874 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build.htm
@@ -9,14 +9,15 @@
 </head>
 <body>
 
-<h1>C/C++ Project Properties, Managed,  Build</h1>
-Customizes your build configuration, compiler and compile options.
-<p><img img src="../images/mprop_build.png" alt="C/C++ Project Properties, Managed,  Build"></p>
+<h1>C/C++ Project Properties, Managed, C/C++ Build</h1>
+Customizes the options used in your build configuration. Select a tab in the 
+Configuration Settings area to set a specific category of options.<p><img img src="../images/mprop_build.png" alt="C/C++ Project Properties, Managed,  Build"></p>
 
 <p><dl>
-	<dt>Platform:</dt><dd>Select the platform from the list provided.</dd>
-	<dt>Configurations:</dt><dd>Select the build configuration from the list provided.</dd>
-	<dt>Manage...</dt><dd>You can change the make command, make flags, add and remove configurations, and change the name of the build goal.</dd>
+	<dt>Project Type:</dt><dd>Displays the type of project that is built by the 
+	selected build configuration.</dd>
+	<dt>Configuration:</dt><dd>Select the build configuration from the list provided.</dd>
+	<dt>Manage...</dt><dd>You can add and remove configurations.</dd>
 	<dt>Configuration Settings</dt><dd>Edit individual options.</dd>
 	<dt>Restore Defaults</dt><dd>Returns any changes back to their default setting.</dd>
 	<dt>Apply</dt><dd>Applies any changes.</dd>
@@ -41,9 +42,12 @@ Customizes your build configuration, compiler and compile options.
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 <p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm
new file mode 100644
index 00000000000..5e0cb987a38
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_build_settings.htm
@@ -0,0 +1,59 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//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++ Project Properties, Managed,  Build</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>C/C++ Project Properties, Managed,  C/C++ Build, Build Settings</h1>
+Customizes your build configuration command and output settings.
+<p><img img src="../images/mprop_build_settings.png" alt="C/C++ Project Properties, Managed,  Build"></p>
+
+<p><dl>
+	<dt>Project Type:</dt><dd>Displays the type of project that is built by the 
+	selected build configuration.</dd>
+	<dt>Configuration:</dt><dd>Select the build configuration from the list provided.</dd>
+	<dt>Manage...</dt><dd>You can add and remove configurations.</dd>
+	<dt>Configuration Settings, Build Settings</dt><dd>You can change the build 
+	command, build flags and the name of the build goal.</dd>
+	<dt>Restore Defaults</dt><dd>Returns any changes back to their default setting.</dd>
+	<dt>Apply</dt><dd>Applies any changes.</dd>
+</dl></p>
+
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
+<a href="cdt_u_sprop_info.htm">C++ Project Properties, Standard, Info</a><br>
+<a href="cdt_u_sprop_builders.htm">C++ Project Properties, Standard, Builders</a><br>
+<a href="cdt_u_sprop_file_types.htm">C++ Project Properties, Standard, File Types</a><br>
+<a href="cdt_u_sprop_includes.htm">C++ Project Properties, Standard, Include Paths and Symbols</a><br>
+<a href="cdt_u_sprop_indexer.htm">C++ Project Properties, Standard, Indexer</a><br>
+<a href="cdt_u_sprop_mbuild.htm">C++ Project Properties, Standard, Make Builder</a><br>
+<a href="cdt_u_sprop_merror.htm">C++ Project Properties, Standard, Error Parser</a><br>
+<a href="cdt_u_sprop_mbinary.htm">C++ Project Properties, Standard, Binary Parser</a><br>
+<a href="cdt_u_sprop_mdiscovery.htm">C++ Project Properties, Standard, Discovery Options</a><br>
+<a href="cdt_u_sprop_psource.htm">C++ Project Properties, Standard, Source</a><br>
+<a href="cdt_u_sprop_poutput.htm">C++ Project Properties, Standard, Output</a><br>
+<a href="cdt_u_sprop_pproj.htm">C++ Project Properties, Standard, Projects</a><br>
+<a href="cdt_u_sprop_plib.htm">C++ Project Properties, Standard, Libraries</a><br>
+<a href="cdt_u_sprop_pcontainers.htm">C++ Project Properties, Standard, Path Containers</a><br>
+<a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
+<a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
+<a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
+<a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
+<a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
+<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
+
+<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_u_mprop_builders.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_builders.htm
index 053d37db499..1f19794ed78 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_builders.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_builders.htm
@@ -44,10 +44,13 @@
 <a href="cdt_u_sprop_pcontainers.htm">C++ Project Properties, Standard, Path Containers</a><br>
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_file_types.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_file_types.htm
index 24538afd3d0..1c618d5bfbf 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_file_types.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_file_types.htm
@@ -42,9 +42,12 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_indexer.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_indexer.htm
index 516543f5b9f..d7e90c25a85 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_indexer.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_indexer.htm
@@ -42,9 +42,12 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_info.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_info.htm
index 2b54a8a0ed0..b4f1d9521b0 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_info.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_info.htm
@@ -38,10 +38,13 @@
 <a href="cdt_u_sprop_pcontainers.htm">C++ Project Properties, Standard, Path Containers</a><br>
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm
index b68418d48b7..47719ee73f2 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_mbinary.htm
@@ -9,11 +9,13 @@
 </head>
 <body>
 
-<h1>C/C++ Project Properties, Managed, Binary Parser</h1>
+<h1>C/C++ Project Properties, Managed, C/C++ Build, Binary Parser</h1>
 <p>You can select the Binary Parsers you require for the project.  </p>
 
-<p>To ensure the accuracy of the C/C++ Projects view and the ability to successfully run and debug your programs. 
-After you select the correct parser for your development environment and build your project, you can view the symbols of the .o file in the C/C++ Projects view.</p>
+<p>To ensure the accuracy of the C/C++ Projects view and the ability to 
+successfully run and debug your programs. After you select the correct parser 
+for your development environment and build your project, you can view the 
+symbols of the object file in the C/C++ Projects view.</p>
 
 
 
@@ -22,7 +24,11 @@ After you select the correct parser for your development environment and build y
 
 
 <dl>
-  <dt>Binary Parser</dt>
+	<dt>Project Type:</dt><dd>Displays the type of project that is built by the 
+	selected build configuration.</dd>
+	<dt>Configuration:</dt><dd>Select the build configuration from the list provided.</dd>
+	<dt>Manage...</dt><dd>You can add and remove configurations.</dd>
+	<dt>Configuration Settings, Binary Parser</dt>
   <dd>Select a binary parser from the list.</dd>
   <dt>Binary Parser Options</dt>
   <dd>If a binary parser has parser options you can define them in this section.</dd>
@@ -53,10 +59,12 @@ After you select the correct parser for your development environment and build y
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm
index 55f3fd7922a..013af75bfa4 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm
@@ -9,15 +9,19 @@
 </head>
 <body>
 
-<h1>C/C++ Project Properties, Managed, Error Parser</h1>
-<p>You can view a list of the filters that detect error patterns in the build output log, on the Error Parsers page of a C/C++ project's preferences window.</p>
+<h1>C/C++ Project Properties, Managed, C/C++ Build, Error Parsers</h1>
+<p>You can view a list of the filters that detect error patterns in the build output log, on the Error Parsers page of a C/C++ project's properties window.</p>
 
 <p><img img src="../images/mprop_errorp.png" alt="C/C++ Project Properties, Managed, Error Parser"></p>
 
 
 
 <dl>
-  <dt>Error Parsers</dt>
+  <dt>Project Type:</dt><dd>Displays the type of project that is built by the 
+	selected build configuration.</dd>
+  <dt>Configuration:</dt><dd>Select the build configuration from the list provided.</dd>
+  <dt>Manage...</dt><dd>You can add and remove configurations.</dd>
+  <dt>Configuration Settings, Error Parsers</dt>
   <dd>Lists the various error parsers which can be enabled or disabled.</dd>
   <dt>Up</dt>
   <dd>Moves the selected error parser higher in the list.</dd>
@@ -27,6 +31,8 @@
   <dd>Selects all error parsers.</dd>
   <dt>Unselect All</dt>
   <dd>Clears all error parsers.</dd>
+  <dt>Restore Defaults</dt><dd>Returns any changes back to their default setting.</dd>
+  <dt>Apply</dt><dd>Applies any changes.</dd>
 </dl>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
@@ -53,7 +59,10 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_ref.htm
index 3566890ea41..fcaddf3766c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_ref.htm
@@ -38,10 +38,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm
new file mode 100644
index 00000000000..0a034e2b2f7
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_tool_settings.htm
@@ -0,0 +1,58 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//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++ Project Properties, Managed,  Build</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>C/C++ Project Properties, Managed,  C/C++ Build, Tool Settings</h1>
+Customizes the tools and tool options used in your build configuration.
+<p><img img src="../images/mprop_build.png" alt="C/C++ Project Properties, Managed,  Build"></p>
+
+<p><dl>
+	<dt>Project Type:</dt><dd>Displays the type of project that is built by the 
+	selected build configuration.</dd>
+	<dt>Configuration:</dt><dd>Select the build configuration from the list provided.</dd>
+	<dt>Manage...</dt><dd>You can add and remove configurations.</dd>
+	<dt>Configuration Settings, Tool Settings</dt><dd>Edit individual tool options.</dd>
+	<dt>Restore Defaults</dt><dd>Returns any changes back to their default setting.</dd>
+	<dt>Apply</dt><dd>Applies any changes.</dd>
+</dl></p>
+
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
+<a href="cdt_u_sprop_info.htm">C++ Project Properties, Standard, Info</a><br>
+<a href="cdt_u_sprop_builders.htm">C++ Project Properties, Standard, Builders</a><br>
+<a href="cdt_u_sprop_file_types.htm">C++ Project Properties, Standard, File Types</a><br>
+<a href="cdt_u_sprop_includes.htm">C++ Project Properties, Standard, Include Paths and Symbols</a><br>
+<a href="cdt_u_sprop_indexer.htm">C++ Project Properties, Standard, Indexer</a><br>
+<a href="cdt_u_sprop_mbuild.htm">C++ Project Properties, Standard, Make Builder</a><br>
+<a href="cdt_u_sprop_merror.htm">C++ Project Properties, Standard, Error Parser</a><br>
+<a href="cdt_u_sprop_mbinary.htm">C++ Project Properties, Standard, Binary Parser</a><br>
+<a href="cdt_u_sprop_mdiscovery.htm">C++ Project Properties, Standard, Discovery Options</a><br>
+<a href="cdt_u_sprop_psource.htm">C++ Project Properties, Standard, Source</a><br>
+<a href="cdt_u_sprop_poutput.htm">C++ Project Properties, Standard, Output</a><br>
+<a href="cdt_u_sprop_pproj.htm">C++ Project Properties, Standard, Projects</a><br>
+<a href="cdt_u_sprop_plib.htm">C++ Project Properties, Standard, Libraries</a><br>
+<a href="cdt_u_sprop_pcontainers.htm">C++ Project Properties, Standard, Path Containers</a><br>
+<a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
+<a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
+<a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
+<a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
+<a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
+<a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
+
+<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_u_new_proj_wiz_m_cindexer.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_cindexer.htm
index b03b6649fe7..6f29059abe5 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_cindexer.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_cindexer.htm
@@ -16,7 +16,7 @@ function changeSize(theImage,wd,ht) {
 </script>
 </head>
 <h1>New Project Wizard - Managed Make, C/C++ Indexer</h1>
-<p>You can select which C/C++ Indexers to use for your project from this page of the wizard. The indexer is necessary for search and related features, like content assist.</p>
+<p>You can select whether to enable the C/C++ Indexer for your project from this page of the wizard. The indexer is necessary for search and related features, like content assist.</p>
 
 <p><img src="../images/new_proj_wz_man_indexer.png"  alt="New Project Wizard"></p>
 
@@ -33,8 +33,8 @@ function changeSize(theImage,wd,ht) {
 	<td>When selected C++ Indexing is enabled for this project.</td>
 </tr> 
 <tr>
-	<td><b>Enable C++ Index problem reporting</b></td>
-	<td>When selected, any index related errors detected will be reported.</td>
+	<td><b>C++ Index problem reporting</b></td>
+	<td>Select the categories of index related errors that will be reported.</td>
  </tr>
 </table></p>
 
@@ -50,9 +50,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
 <a href="cdt_u_new_proj_wiz_s_mbuilder.htm">Standard Make, Make Builder</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_errorp.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_errorp.htm
index 83059ca718a..2daebc42496 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_errorp.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_errorp.htm
@@ -66,7 +66,7 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_name.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_name.htm
index 089b2093f28..2825ffc0081 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_name.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_name.htm
@@ -52,9 +52,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_proj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_proj.htm
index 63fe7dff6c1..3812eb63098 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_proj.htm
@@ -45,8 +45,7 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_target.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_target.htm
index 455952299ea..ba5736e13b3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_target.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_m_target.htm
@@ -7,9 +7,9 @@
 	<title>New Project Wizard - Managed Make, Select a Target</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
-<h1>New Project Wizard - Managed Make, Select a Target</h1>
-<p>You can enter the build targets and build configurations from this page of the wizard.</p>
-<p><img src="../images/new_proj_wz_man_target.png"  alt="New Project Wizard, Managed Make, Select a Target"></p>
+<h1>New Project Wizard - Managed Make, Select a Project Type</h1>
+<p>You can select the type of project and build configurations from this page of the wizard.</p>
+<p><img src="../images/new_proj_wz_man_target.png"  alt="New Project Wizard, Managed Make, Select a Project Type"></p>
 
 <p> <table border="1" cellspacing="0">
  <tr>
@@ -18,8 +18,8 @@
 </tr> 
 
 <tr>
-	<td><b>Build Target</b></td>
-	<td>You can select a build target from the drop down list.</td>
+	<td><b>Project Type</b></td>
+	<td>You can select a project type from the drop down list.</td>
 </tr> 
 <tr>
 	<td><b>Configurations</b></td>
@@ -27,8 +27,8 @@
 
  </tr>
  <tr>
-	<td><b>Show All Targets</b></td>
-	<td>If selected, all known targets will appear in the <b>Configurations</b> window, by default, the list is filtered so that only targets for the host OS are shown.</td>
+	<td><b>Show All Project Types</b></td>
+	<td>If selected, all known project types will appear in the <b>Configurations</b> window, by default, the list is filtered so that only project types for the host OS are shown.</td>
 
 </tr>
 </table></p>
@@ -47,7 +47,6 @@
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_binary.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_binary.htm
index 985ec508d43..1abfff0e61b 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_binary.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_binary.htm
@@ -51,9 +51,8 @@ After you select the correct parser for your development environment and build y
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_cindexer.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_cindexer.htm
index 0537ecdb2e4..aa30698d4b8 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_cindexer.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_cindexer.htm
@@ -49,9 +49,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_discovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_discovery.htm
index a297acd346b..efd01646860 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_discovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_discovery.htm
@@ -50,9 +50,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_errorp.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_errorp.htm
index 5d98c9fd377..b4b22400dee 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_errorp.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_errorp.htm
@@ -61,9 +61,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_mbuilder.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_mbuilder.htm
index f4a5f169403..ba37454af0d 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_mbuilder.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_mbuilder.htm
@@ -56,9 +56,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_name.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_name.htm
index 1171484240b..80e686d0aa9 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_name.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_name.htm
@@ -55,9 +55,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_proj.htm">Standard Make, Referenced Projects</a><br>
 <a href="cdt_u_new_proj_wiz_s_mbuilder.htm">Standard Make, Make Builder</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_proj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_proj.htm
index e81ea95eb91..31e19eeafd6 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_new_proj_wiz_s_proj.htm
@@ -45,9 +45,8 @@ function changeSize(theImage,wd,ht) {
 
 <p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
 <a href="cdt_u_new_proj_wiz.htm">New Project Wizard</a><br>
-<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Target</a><br>
+<a href="cdt_u_new_proj_wiz_m_target.htm">Managed Make, Select a Project Type</a><br>
 <a href="cdt_u_new_proj_wiz_m_proj.htm">Managed Make, Referenced Projects</a><br>
-<a href="cdt_u_new_proj_wiz_m_errorp.htm">Managed Make, Error Parsers</a><br>
 <a href="cdt_u_new_proj_wiz_m_cindexer.htm">Managed Make, C/C++ Indexer</a><br>
 <a href="cdt_u_new_proj_wiz_s_name.htm">Standard Make, Name</a><br>
 <a href="cdt_u_new_proj_wiz_s_mbuilder.htm">Standard Make, Make Builder</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
index c4a7bfaa074..3e4332adb05 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_properties.htm
@@ -37,10 +37,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</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_sprop_builders.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_builders.htm
index 7849edfd350..bf7f4d9f5a6 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_builders.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_builders.htm
@@ -43,10 +43,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_file_types.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_file_types.htm
index 3b53b3a23db..0d99979cbb5 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_file_types.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_file_types.htm
@@ -42,10 +42,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_includes.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_includes.htm
index c985c180d0b..56364246fb4 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_includes.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_includes.htm
@@ -50,10 +50,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_indexer.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_indexer.htm
index aea9921a580..926e7ea317c 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_indexer.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_indexer.htm
@@ -43,10 +43,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_info.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_info.htm
index 9b385929766..277b3547956 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_info.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_info.htm
@@ -38,10 +38,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbinary.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbinary.htm
index bb81b0011c4..7b59c2d1206 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbinary.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbinary.htm
@@ -53,10 +53,13 @@ After you select the correct parser for your development environment and build y
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbuild.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbuild.htm
index 33a1b529c28..35e4e73d001 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbuild.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mbuild.htm
@@ -52,10 +52,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 <img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" > 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm
index 2034ab0c6e4..dafcc1d7c29 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm
@@ -46,10 +46,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_merror.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_merror.htm
index 82240774c47..fcc63e22223 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_merror.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_merror.htm
@@ -54,10 +54,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 <p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pcontainers.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pcontainers.htm
index 768ae532098..2857e1b6f32 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pcontainers.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pcontainers.htm
@@ -39,10 +39,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 <p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_plib.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_plib.htm
index 4a028829342..b18e907086e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_plib.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_plib.htm
@@ -41,10 +41,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_poutput.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_poutput.htm
index 95802917fbe..72ed5dc37f3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_poutput.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_poutput.htm
@@ -38,10 +38,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pproj.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pproj.htm
index c01f718893a..645460c6906 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pproj.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_pproj.htm
@@ -37,10 +37,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_psource.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_psource.htm
index aef2d5dbcc5..39bba2f06b9 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_psource.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_psource.htm
@@ -38,10 +38,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_ref.htm
index 2fe50258023..816acb42a56 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_ref.htm
@@ -38,10 +38,13 @@
 <a href="cdt_u_sprop_ref.htm">C++ Project Properties, Standard, Project References</a><br>
 <a href="cdt_u_mprop_info.htm">C++ Project Properties, Managed, Info</a><br>
 <a href="cdt_u_mprop_builders.htm">C++ Project Properties, Managed, Builders</a><br>
-<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, Build</a><br>
+<a href="cdt_u_mprop_build.htm">C++ Project Properties, Managed, C/C++ Build</a><br>
+<a href="cdt_u_mprop_tool_settings.htm">C++ Project Properties, Managed, C/C++ Build, Tool Settings</a><br>
+<a href="cdt_u_mprop_build_settings.htm">C++ Project Properties, Managed, C/C++ Build, Build Settings</a><br>
+<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, C/C++ Build, Error Parsers</a><br>
+<a href="cdt_u_mprop_mbinary.htm">C++ Project Properties, Managed, C/C++ Build, Binary Parser</a><br>
 <a href="cdt_u_mprop_file_types.htm">C++ Project Properties, Managed, File Types</a><br>
 <a href="cdt_u_mprop_indexer.htm">C++ Project Properties, Managed, Indexer</a><br>
-<a href="cdt_u_mprop_merror.htm">C++ Project Properties, Managed, Error Parser</a><br>
 <a href="cdt_u_mprop_ref.htm">C++ Project Properties, Managed, Project References</a></p>
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
index 7e8320275c0..5dfdf24921b 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm
@@ -12,18 +12,20 @@
 
 <h1>Converting CDT 1.x Projects</h1>
 
-<p>There are two ways to update CDT 1.x projects to CDT 2.0, after they have been imported, either restart eclipse, or update them using the <b>Convert to C/C++ Make Project Wizard</b>.</p>
-<p><b>Note:</b> the project must first be imported into your workspace using <b>File > Import > Existing Project into Workspace</b> before you can update the project.</p>
+<p>How you update your CDT 1.x project to CDT 2.1 depends upon whether the 
+project is a Standard Make project or a Managed Make project. For a Standard 
+Make project, see <b>Convert to C/C++ Make Project Wizard below.</b></p>
+<h2>Updating a Managed Make Project </h2>
 
-<p>For more information on importing projects see <b>Workbench &gt; Tasks &gt; Importing &gt; Importing Existing Projects</b>.
-
-<h2>Restart Eclipse</h2>
-
-<p>When Eclipse starts, the CDT 1.x project will be detected and you will be prompted to update the project.</p>
+<p>For a Managed Make project, the Managed Build system will prompt you to 
+convert your project when it attempts to read the Managed Build project 
+information and discovers that project needs to be updated.&nbsp; You will be prompted to update the project.</p>
 <p> <img src="../images/update_managed_build.png" alt="Update Managed Builder dialog box"></p>
-<p>Click <b>Yes</b> and the project will be updated.</p>
-
-<p>&nbsp;</p>
+<p>Click <b>Yes</b> and the project will be updated.&nbsp; The updated Managed 
+Build information can no longer be loaded by CDT 1.x or CDT 2.0.&nbsp; Select <b>
+No</b> and the project will not be updated.&nbsp; You will be able to view the 
+Managed Build settings, but no changes will be saved when you close the project 
+or exit Eclipse.</p>
 
 <h2>Convert to C/C++ Make Project Wizard</h2>
 
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 9827bd51ba4..6c789039747 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -66,11 +66,14 @@
 		<topic label="Managed Make Projects" href="reference/cdt_o_mmake_proj.htm">
 			<topic label="Info" href="reference/cdt_u_mprop_info.htm"/>
 			<topic label="Builders" href="reference/cdt_u_mprop_builders.htm"/>
-			<topic label="Build" href="reference/cdt_u_mprop_build.htm"/>
+			<topic label="C/C++ Build" href="reference/cdt_u_mprop_build.htm">
+				<topic label="Tool Settings" href="reference/cdt_u_mprop_tool_settings.htm"/>
+				<topic label="Build Settings" href="reference/cdt_u_mprop_build_settings.htm"/>
+				<topic label="Error Parser" href="reference/cdt_u_mprop_merror.htm"/>
+				<topic label="Binary Parser" href="reference/cdt_u_mprop_mbinary.htm"/>
+			</topic>
 			<topic label="File Types" href="reference/cdt_u_mprop_file_types.htm"/>
 			<topic label="Indexer" href="reference/cdt_u_mprop_indexer.htm"/>
-			<topic label="Error Parser" href="reference/cdt_u_mprop_merror.htm"/>
-			<topic label="Binary Parser" href="reference/cdt_u_mprop_mbinary.htm"/>
 			<topic label="Project References" href="reference/cdt_u_mprop_ref.htm"/>
 		</topic>
 		<topic label="Standard Make Projects" href="reference/cdt_o_smake_proj.htm">
@@ -98,9 +101,8 @@
 	<topic label="C/C++ New Project Wizard" href="reference/cdt_u_new_proj_wiz.htm">
 		<topic label="Managed Make Projects" href="reference/cdt_o_new_mproj.htm">
 			<topic label="Name" href="reference/cdt_u_new_proj_wiz_m_name.htm"/>
-			<topic label="Select a Target" href="reference/cdt_u_new_proj_wiz_m_target.htm"/>
+			<topic label="Select a Project Type" href="reference/cdt_u_new_proj_wiz_m_target.htm"/>
 			<topic label="Referenced Projects" href="reference/cdt_u_new_proj_wiz_m_proj.htm"/>
-			<topic label="Error Parsers" href="reference/cdt_u_new_proj_wiz_m_errorp.htm"/>
 			<topic label="C/C++ Indexer" href="reference/cdt_u_new_proj_wiz_m_cindexer.htm"/>
 		</topic>
 		<topic label="Standard Make Projects" href="reference/cdt_o_new_sproj.htm">