From Dave Williams:

Doc patch for bug # 44464, 56753, 59317

Updates required for UI changes.

doc/org.eclipse.cdt.doc.user/reference/cdt_o_ceditor_pref.htm

@@ -15,7 +15,6 @@
 <p>This section describes how to set preferences for the C/C++ editor.</p>
 
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">General</a><br>
-	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_anno.htm">Annotations</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Colors</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist</a><br>
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_navigation.htm">Navigation</a><br>

doc/org.eclipse.cdt.doc.user/reference/cdt_o_proj_prop_pages.htm

@@ -17,10 +17,7 @@
 	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_error.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_newproj_parser_binary.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_newproj_pathsymb.htm">Paths and Symbols</a><br>
-		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_scanner_cfg_disc.htm">Scanner Configuration Discovery</a><br>
-		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_incl_path.htm">Manage Include Paths</a><br>
-		<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_def_symb.htm">Manage Defined Symbols</a><br>
-
+	<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_discovery_preferences.htm">Discovery Options</a><br>
 
 <p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
 </body>

doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm

@@ -46,10 +46,10 @@
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_build_pref.htm">Build Console</a><br>
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_o_ceditor_pref.htm">C/C++ Editor preferences</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_gen.htm">General</a><br>
-		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_anno.htm">Annotations</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Colors</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_con_assist.htm">Content Assist</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_navigation.htm">Navigation</a><br>
+	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_file_types.htm">File Types</a><br>
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt=""><a style="text-decoration:none" href="cdt_u_code_temp.htm">Code Templates</a><br>
 	<img src="../images/trans.gif" border="0" width="100" height="1" alt="">Debug<br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt="">GDB MI<br>
@@ -59,10 +59,7 @@
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_buildset.htm">Make Builder</a><br>
 		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_error.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_newproj_parser_binary.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_newproj_pathsymb.htm">Paths and Symbols</a><br>
-			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_scanner_cfg_disc.htm">Scanner Configuration Discovery</a><br>
-			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_incl_path.htm">Manage Include Paths</a><br>
-			<img src="../images/trans.gif" border="0" width="200" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_def_symb.htm">Manage Defined Symbols</a><br>
+		<img src="../images/trans.gif" border="0" width="150" height="1" alt=""><a style="text-decoration:none" href="cdt_u_discovery_preferences.htm">Discovery Options</a><br>
 <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_properties.htm">C/C++ Project Properties</a><br>
 	<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>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_build_pref.htm

@@ -21,8 +21,7 @@ function changeSize(theImage,wd,ht) {
 <h1>Build Console page, Preferences window</h1>
 
 <p>You can customize the appearance of the Build Console view.</p>
-<p><img src="../images/BuildConsole.png" width="318" height="270" onClick="changeSize(this,318,270);" 
-	    alt="Build Console Preferences Dialog Box" title="click to toggle image size"></p>
+<p><img src="../images/cdt_pref_build_console.png" alt="Build Console Preferences Dialog Box"></p>
 
 <dl>
   <dt>Always clear console before building</dt>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_color.htm

@@ -24,8 +24,7 @@ END INFOPOP-->
 <h1>Colors page, Preferences window</h1>
 
 <p>You can customize the appearance of the C/C++ editor on the Colors page of the Preferences window.</p>
-<p><img src="../images/editor_color_preferences.png" width="335" height="304" onClick="changeSize(this,335,304);" 
-	     alt="Editor General Preferences Dialog Box" title="click to toggle image size"></p>
+<p><img src="../images/editor_color_preferences.png" alt="Editor General Preferences Dialog Box"></p>
 
 <dl>
   <dt>System Default</dt>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_con_assist.htm

@@ -24,8 +24,7 @@ END INFOPOP-->
 
 <p>You can customize the Content Assist feature on the Contents Assist page of the C/C++ Editor Preferences window.  To change the Content Assist preferences click
 <b>Window &gt; Preferences &gt; C/C++ &gt; C++ Editor &gt; Content Assist.</b></p>
-<p><img src="../images/contentAssist_preferences.png" width="334" height="263" onClick="changeSize(this,334,263);" 
-	     alt="Content Assist Preferences Dialog Box" title="click to toggle image size"></p>
+<p><img src="../images/contentAssist_preferences.png" alt="Content Assist Preferences Dialog Box"></p>
 
 <dl>
 	<p><dt>Search scope for completion proposals</dt>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_gen.htm

@@ -24,13 +24,9 @@ END INFOPOP-->
 <h1>General page, Preferences window</h1>
 
 <p>You can customize the appearance of the C/C++ editor on the General page of the Preferences window.</p>
-<p><img src="../images/editor_general_preferences.png" width="335" height="304" onClick="changeSize(this,335,304);" 
-	    alt="Editor General Preferences Dialog Box" title="click to toggle image size"></p>
-
+<p><img src="../images/editor_general_preferences.png" alt="Editor General Preferences Dialog Box"></p>
 	
 <dl>
-  <dt>Text Font</dt>
-  <dd>Changes the font of the text in the workbench.</dd> 
   <dt>Displayed tab width</dt>
   <dd>Specifies the width of the tab as a number of characters. For example a value of <b>4</b>, 
   means that the tab width is 4-characters wide.</dd>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_editor_navigation.htm

@@ -24,8 +24,7 @@ END INFOPOP-->
 <h1>Navigation page, Preferences window</h1>
 
 <p>You can customize the navigation configuration of the C/C++ editor on the Navigation page of the Preferences window.</p>
-<p><img src="../images/editor_navigation_preferences.png" width="333" height="306" onClick="changeSize(this,333,306);" 
-	    alt="Editor Navigation Preferences Dialog Box" title="click to toggle image size"></p>
+<p><img src="../images/editor_navigation_preferences.png" alt="Editor Navigation Preferences Dialog Box"></p>
 <dl>
   <dt>Enable Hyperlink Navigation</dt>
   <dd>Select this checkbox to support hyperlink style navigation for Open Declarations.</dd>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_file_types.htm

@@ -0,0 +1,47 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<html lang="en">
+
+<head>
+	<meta http-equiv="Content-Language" content="en-us">
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+	<title>C/C++ File Types page, Preferences window</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+<script language="JavaScript">
+function changeSize(theImage,wd,ht) {
+	wdth=parseInt(theImage.style.width); hght=parseInt(theImage.style.height);
+	if ( !(wdth==(wd*2)) ) {wdth=wd*2; hght=ht*2;}
+	else {wdth=wd;hght=ht;}
+	theImage.style.width=wdth; theImage.style.height=hght;
+}
+</script>
+</head>
+
+<!--INFOPOP
+Customize the navigation within the C/C++ editor.
+END INFOPOP-->
+<body>
+
+<h1>C/C++ File Types page, Preferences window</h1>
+
+<p>You can define which file extensions are linked to specific languages.</p>
+<p><img src="../images/cdt_pref_file_types.png" alt="File Types Preferences Dialog Box"></p>
+<dl>
+  <dt>New</dt>
+  <dd>Add a new File Type definition.</dd>
+  <dt>Remove</dt>
+  <dd>Remove the currently selected File Type definition.</dd>
+</dl>
+
+<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"> <br>
+<a href="../concepts/cdt_o_code_entry.htm">Coding aids</a></p>
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
+<br>
+<a href="../tasks/cdt_t_cust_cpp_editor.htm">Customizing the C/C++ editor</a></p>
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
+<br>
+<a href="cdt_o_ceditor_pref.htm">C/C++ editor preferences</a></p>
+<img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14">
+
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_c_pref.htm

@@ -23,15 +23,14 @@ END INFOPOP-->
 <h1>C/C++ page, Preferences window</h1>
 
 <p>The C/C++ Preference dialog box allows you to make changes to your C/C++ environment.</p>
-<p>	<img src="../images/c_cpp_preferences.png" width="318" height="270" onClick="changeSize(this,318,270);" 
-	     alt="C/C++ Main Preferences Window" title="click to toggle image size"></p>
+<p><img src="../images/c_cpp_preferences.png" alt="C/C++ Main Preferences Window"></p>
 <dl>
   <dt>Link view selection to active editor</dt>
   <dd>Select this checkbox to open an item selected in the Projects view, in the Editor view.</dd>
   <dt>Show file members in Project View</dt>
   <dd>Select this checkbox to browse your C and C++ file members in the Projects view.</dd>
-  <dt>Use Structural-Parse mode to build the CModel</dt>
-  <dd>Select this checkbox to follow the #include when you produce the Outline view.</dd>
+  <dt>Follow #include's when producing the outline view.</dt>
+  <dd>Select this checkbox to follow all defined #includes when you produce the Outline view.</dd>
 </dl>
 
 <h2>C/C++ Submenu Items</h2>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_discovery_preferences.htm

@@ -0,0 +1,44 @@
+<!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, Standard, Discovery Options</title>
+	<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+
+<h1>Discovery Options page, C/C++ Preferences window</h1>
+
+<p>You can define the discovery options on the Discovery Options page of a C/C++ Preferences window.</p>
+
+<p><img img src="../images/discovery_preferences.png" alt="Discovery Options, Preferences Dialog Box"></p>
+
+<p>
+<dl>
+	<dt>Automate scanner configuration discovery</dt>
+	<dd>Select this checkbox to configure the scanner discovery to run automatically.</dd>
+	<dt>Build output parser options</dt>
+	<dd>This section allows you to select the output parser.</dd>
+	<dt>Generate scanner info command options</dt>
+	<dd>This section allows you to select the scanner info settings.</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/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
+<br>
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21">
+<br>
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"><br>
+</p>
+
+
+<img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"> 
+
+
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_indexer.htm

@@ -13,7 +13,7 @@
 <p>You can select which C/C++ Indexers to use for your project. The indexer is necessary for search and related features, like content assist.</p>
 
 
-<p><img img src="../images/sprop_indexer.png" alt="C/C++ Project Properties, Managed, Indexer"></p>
+<p><img img src="../images/mprop_indexer.png" alt="C/C++ Project Properties, Managed, Indexer"></p>
 
 <p><dl>
 	<dt>Enable C/C++ Indexing</dt><dd>When selected C++ Indexing is enabled for this project.</dd>

doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm

@@ -20,6 +20,8 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_new_cpp.htm">Create a cpp file</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_new_make.htm">Create a makefile</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_prvw_hide_files.htm">Hide files of a given type</a><br>
+	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_convert_cdt_proj.htm">Converting CDT 1.x Projects</a><br>
+	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_add_custom_persp.htm">Adding Convert to a C/C++ Make Project to the New menu</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_write_code.htm">Write code</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_cust_cpp_editor.htm">Customize the C/C++ editor</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_comment_out.htm">Comment out code</a><br>
@@ -30,6 +32,7 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_shift_code.htm">Shift lines of code to the left or right</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_search.htm">Search for C/++ elements</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_open_declarations.htm">Navigate to C/C++ declarations by name</a><br>
+	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_add_includes.htm">Adding #include directives</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_build_task.htm">Build your C or C++ projects</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_rename.htm">Rename a project</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_ref.htm">Select referenced projects</a><br>
@@ -40,6 +43,7 @@
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_platf.htm">Select deployment platform for managed make projects</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_setbuildorder.htm">Set build order</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_manualbuild.htm">Build your project as required</a><br>
+	<img src="../images/trans.gif" border="0" width="50" 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="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_autosave.htm">Autosaving on manual build</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_addmaketarget.htm">Add a make target</a><br>
 	<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_cbuild_pref.htm">Customize the Console view</a><br>

doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_custom_persp.htm

@@ -0,0 +1,41 @@
+<!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>Displaying C/C++ file components in the C/C++ Projects view</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+ 
+<h1>Adding Convert to a C/C++ Make Project to the New menu</h1>
+
+<p>If <b>Convert to a C/C++ Make Project</b> is not available in your menubar, you can add it by clicking <b>Window > Customize Perspective</b></p>
+<p><img src="../images/window_customize_perspective.png" alt="Window - Customize Perspective menu selection"></p>
+
+<p>&nbsp;</p>
+
+<p>From the <b>Customize Perspecive Wizard</b> select <b>Convert to a C/C++ Make Project</b> and click <b>OK</b>.</p>
+<p><img src="../images/customize_perspective.png" alt="Customize Perspective Wizard"></p>
+
+<p>&nbsp;</p>
+
+<p>The <b>File > New > Convert to a C/C++ Make Project</b> option will now be available.</p>
+<p><img src="../images/file_new_conv.png" alt="File New Menu showing Convert to a C/C++ Make Project"></p>
+
+
+  
+<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"></p>
+
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"><br>
+<a href="cdt_t_convert_cdt_proj.htm">Converting CDT 1.x Projects</a></p>
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"></p>
+
+<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
+
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_includes.htm

@@ -0,0 +1,38 @@
+<!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>Adding #include directivess</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h1>Adding #include directives</h1>
+
+<p>You can quickly add an <span class="command">#include</span> 
+
+directive for any documented function:
+</p>
+
+<ol>
+<li>In the <span class="guilabel">C/C++</span> editor, select the function name 
+(excluding the parentheses or any leading tabs or spaces).</li>
+<li>Right-click and choose <span class="guilabel">Add Include</span>.
+<p>The <span class="command">#include</span> statement 
+for the selected function name is added to the top of the file, 
+if it is not already there.
+</p>
+
+</li>
+</ol>
+
+<p>
+<img src="../images/rh03_04.gif" ALT="Red Hat Copyright Statement" BORDER=0 width="324" height="14"><br>
+<img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14">
+</p>
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/tasks/cdt_t_autobuild.htm

@@ -0,0 +1,37 @@
+<!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>Removing Build Automatically</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<h1>Removing Build Automatically</h1>
+
+<p>The Eclipse workbench is configured to build projects automatically.  However for C/C++ development you should turn this feature off, 
+otherwise your entire project will be rebuilt whenever, for example, you save a change to your makefile.
+Click <b>Project > 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" alt="Menubar showing Project selection"></p>
+
+<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_manualbuild.htm">Building Manually</a><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/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14">
+
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm

@@ -0,0 +1,48 @@
+<!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>Displaying C/C++ file components in the C/C++ Projects view</title>
+<link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+
+<body>
+
+<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.
+
+
+<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> <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>
+
+<h2>Convert to C/C++ Make Project Wizard</h2>
+
+<p>Select <b>File > New > Convert to a C/C++ Make Project</b>. If that selection is not available, you can find the instructions for adding it <a href="cdt_t_add_custom_persp.htm">here</a>.</p>
+<p><img src="../images/file_new_conv.png" alt="File - New - Convert to a C/C++ Make Project menu selection"></p>
+ 
+<p>From the <b>Convert to C/C++ Make Project Wizard</b> select the project you want to convert and click <b>Finish</b>.</p>
+<p><img src="../images/convert_proj.png" alt="Convert to C/C++ Make Project Wizard"></p>
+
+<p>&nbsp;</p>
+   
+<p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21"></p>
+
+<p><img border="0" src="../images/ngtasks.gif" ALT="Related tasks" width="143" height="21"><br>
+<a href="cdt_t_add_custom_persp.htm">Adding Convert to a C/C++ Make Project to the New menu</a></p>
+
+<p><img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21"></p>
+
+<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
+
+</body>
+
+</html>

doc/org.eclipse.cdt.doc.user/tasks/cdt_t_manualbuild.htm

@@ -4,27 +4,18 @@
 <head>
 <meta http-equiv="Content-Language" content="en-us">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Building manually</title>
+<title>Building Manually</title>
 <link rel="stylesheet" type="text/css" href="../help.css">
-<script language="JavaScript">
-function changeSize(theImage,wd,ht) {
-	wdth=parseInt(theImage.style.width); hght=parseInt(theImage.style.height);
-	if ( !(wdth==(wd*2)) ) {wdth=wd*2; hght=ht*2;}
-	else {wdth=wd;hght=ht;}
-	theImage.style.width=wdth; theImage.style.height=hght;
-}
-</script>
 </head>
 
 <body>
 
-<h1>Building manually</h1>
+<h1>Building Manually</h1>
 
 <p>Manual builds let you choose the scope of a build, as well as options for building, 
 or rebuilding projects. You can view the output of the make utility in the console.</p>
 
-<p><img src="../images/console_build.png" width="300" height="75" onClick="changeSize(this,300,75);" 
-	     alt="Screen capture showing sample build in console veiw" title="click to toggle image size"></p>
+<p><img src="../images/console_build.png" alt="Sample build in console veiw"></p>
 
 
 <p>To rebuild all open projects:</p>
@@ -46,7 +37,7 @@ want to build only certain projects.</p>
   <li>In C/C++ Projects view, right-click a project, and click <b>Rebuild Project</b>.</li>
 </ul>
 
-<p><b>Tip:</b> If you get the error message:</p>
+<p><b>Tip: </b>If you get the error message:</p>
 
 <p><samp>Exec error:Launching failed</samp></p>
 
@@ -54,6 +45,10 @@ want to build only certain projects.</p>
 that the CDT cannot locate the build command, (usually <samp>make</samp>). Either your path is 
 not configured correctly or you do not have <samp>make</samp> installed on your system.</p>
 
+
+<p><b>Tip: </b>The menubar item <b>Project > Build Working Set</b> submenu for C/C++ projects simply creates a link to the build all target as defined in your makefile, and is no different from an <b>Incremental Build</b>.</p>
+
+
 <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>

doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_build_set.htm

@@ -3,8 +3,6 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<meta name="GENERATOR" content="Microsoft FrontPage 5.0">
-<meta name="ProgId" content="FrontPage.Editor.Document">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Defining build settings</title>
 <link rel="stylesheet" type="text/css" href="../help.css">
@@ -47,6 +45,7 @@ projects.</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>
@@ -58,8 +57,7 @@ projects.</p>
   <li>Click the <b>Make Builder</b> tab.</li>
   <li>Do one of the following:</li>
   <ul>
-  <li>To stop the build when an error is encountered, select <b>Stop on error</b>.</li>
-  <li>To continue the build even if an error is encountered, select <b>Keep going on error</b>.</li>
+  <li>To stop the build when an error is encountered, select <b>Stop on first build error</b>.</li>
   </ul>
   <li>Select one of the following build command settings:</li>
   <ul>

doc/org.eclipse.cdt.doc.user/tasks/cdt_t_show_proj_files.htm

@@ -3,7 +3,7 @@
 
 <head>
 <meta http-equiv="Content-Language" content="en-us">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <title>Displaying C/C++ file components in the C/C++ Projects view</title>
 <link rel="stylesheet" type="text/css" href="../help.css">
 <script language="JavaScript">
@@ -28,14 +28,12 @@ view. You can display or hide all file components in the C/C++ Projects view.</p
 <ol>
   <li>Click <b>Window &gt; Preferences</b>.</li>
   <li>In the Preferences dialog box, select <b>C/C++</b> from the list.<br>
-  <img src="../images/c_cpp_preferences.png" width="318" height="270" onClick="changeSize(this,318,270);" 
-       alt="Screen Capture of the C/C++ Preferences dialog box" title="click to toggle image size"></li>
+  <img src="../images/c_cpp_preferences.png" alt="Screen Capture of the C/C++ Preferences dialog box"></li>
   <li>Select the <b>Show file members in Project View</b> check box.</li>
   <li>Click <b>OK</b>.</li>
   <li>In the C/C++ Projects view, double-click a file component.<br>
 	  The component is  highlighted in the C/C++ editor.<br>
-	  <img src="../images/projectsView.png" width="122" height="213" onClick="changeSize(this,122,213);" 
-       alt="Screen Capture of Projects View with file components" title="click to toggle image size"></li>	  
+	  <img src="../images/view_projects.png"  alt="C/C++ Projects View with file components"></li>	  
  </ol>
 
 <p>The C/C++ Projects view can also be filtered to show certain types of file 

doc/org.eclipse.cdt.doc.user/topics_Reference.xml

@@ -41,22 +41,18 @@
 		<topic label="Build Console" href="reference/cdt_u_build_pref.htm"/>
 		<topic label="C/C++ Editor preferences" href="reference/cdt_o_ceditor_pref.htm">
 			<topic label="General" href="reference/cdt_u_c_editor_gen.htm"/>
-			<topic label="Annotations" href="reference/cdt_u_c_editor_anno.htm"/>
 			<topic label="Colors" href="reference/cdt_u_c_editor_color.htm"/>
 			<topic label="Content Assist" href="reference/cdt_u_c_editor_con_assist.htm"/>
 			<topic label="Navigation" href="reference/cdt_u_c_editor_navigation.htm"/>
 		</topic>
+		<topic label="File Types" href="reference/cdt_u_c_file_types.htm"/>
 		<topic label="Code Templates" href="reference/cdt_u_code_temp.htm"/>
 		<topic label="Make Targets" href="reference/cdt_u_make_targets_pref.htm"/>
 		<topic label="New Make Projects properties" href="reference/cdt_o_proj_prop_pages.htm">
 			<topic label="Make Builder" href="reference/cdt_u_newproj_buildset.htm"/>
 			<topic label="Error Parser" href="reference/cdt_u_newproj_parser_error.htm"/>
 			<topic label="Binary Parser" href="reference/cdt_u_newproj_parser_binary.htm"/>
-			<topic label="Paths and Symbols" href="reference/cdt_u_newproj_pathsymb.htm">
-				<topic label="Scanner Configuration Discovery" href="reference/cdt_u_scanner_cfg_disc.htm"/>
-				<topic label="Manage Include Paths" href="reference/cdt_u_newproj_incl_path.htm"/>
-				<topic label="Manage Defined Symbols" href="reference/cdt_u_newproj_def_symb.htm"/>
-			</topic>
+			<topic label="Discovery Options" href="reference/cdt_u_discovery_preferences.htm"/>
 		</topic>
 	</topic>
 	<topic label="C/C++ Project Properties" href="reference/cdt_u_properties.htm">

doc/org.eclipse.cdt.doc.user/topics_Tasks.xml

@@ -10,6 +10,8 @@
 			<topic label="Create a cpp file" href="tasks/cdt_t_new_cpp.htm"/>
 			<topic label="Create a makefile" href="tasks/cdt_t_new_make.htm"/>
 			<topic label="Hide files of a given type" href="tasks/cdt_t_prvw_hide_files.htm"/>
+			<topic label="Converting CDT 1.x Projects" href="cdt_t_convert_cdt_proj.htm"/>
+			<topic label="Adding Convert to a C/C++ Make Project to the New menu" href="cdt_t_add_custom_persp.htm"/>
 		</topic>
 		<topic label="Write code" href="tasks/cdt_o_write_code.htm">
 			<topic label="Customize the C/C++ editor" href="tasks/cdt_t_cust_cpp_editor.htm"/>
@@ -22,6 +24,7 @@
 			<topic label="Shift lines of code to the left or right" href="tasks/cdt_t_shift_code.htm"/>
 			<topic label="Search for C/C++ elements" href="tasks/cdt_t_search.htm"/>
 			<topic label="Navigate to C/C++ declarations by name" href="tasks/cdt_t_open_declarations.htm"/>
+			<topic label="Adding #include directives" href="cdt_t_add_includes.htm"/>
 		</topic>
 		<topic label="Build your C or C++ projects" href="tasks/cdt_o_build_task.htm">
 			<topic label="Rename a project" href="tasks/cdt_t_proj_rename.htm"/>
@@ -33,6 +36,7 @@
 			<topic label="Select deployment platform for managed make projects" href="tasks/cdt_t_proj_platf.htm"/>
 			<topic label="Set build order" href="tasks/cdt_t_setbuildorder.htm"/>
 			<topic label="Build your project as required" href="tasks/cdt_t_manualbuild.htm"/>
+			<topic label="Removing Build Automatically" href="cdt_t_autobuild.htm"/>
 			<topic label="Autosaving on manual build" href="tasks/cdt_t_autosave.htm"/>
 			<topic label="Add a make target" href="tasks/cdt_t_addmaketarget.htm"/>
 			<topic label="Customize the Console view" href="tasks/cdt_t_cbuild_pref.htm"/>