From Dave Williams: Continuing doc cleanup, new tutorials, updated screen captures, changed workflows as required.

36 files changed, 230 insertions, 200 deletions

diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_o_tutorial.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_o_tutorial.htm
index f1bc3529d50..b8ecab9938b 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_o_tutorial.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_o_tutorial.htm
@@ -13,6 +13,9 @@
 
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_basic.htm">Managed Make Hello World Tutorial</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_standard.htm">Standard Make Hello World Tutorial</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt="">Importing an Existing Project Tutorial<br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt="">Debug Tutorial<br>
+
 <br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_existing_code.htm">How to bring C/C++ source into Eclipse</a><br>
 <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_install_cdt.htm">Updating the CDT</a><br>
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 e49afa5252a..5e3acfb4808 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
@@ -8,10 +8,10 @@
 
 <script language="JavaScript">
 var first = 0;
-var last = 21;
+var last = 22;
 var position = 0;
 
-var cdt_w_basicText= new Array(22) 
+var cdt_w_basicText= new Array(23) 
 cdt_w_basicText[0]='cdt_w_basic01.htm';
 cdt_w_basicText[1]='cdt_w_basic02.htm';
 cdt_w_basicText[2]='cdt_w_basic03.htm';
@@ -34,8 +34,10 @@ 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';
 
-var cdt_w_basicPic= new Array(22) 
+
+var cdt_w_basicPic= new Array(23) 
 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';
@@ -49,7 +51,7 @@ 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.gif';
+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';
@@ -58,8 +60,9 @@ 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';
 
-var screenText= new Array(21) 
+var screenText= new Array(23) 
 screenText[0]='Eclipse Workbench';
 screenText[1]='Opening the C/C++ Perspective';
 screenText[2]='The C++ Perspective';
@@ -68,30 +71,32 @@ screenText[4]='New Project Wizard';
 screenText[5]='New Managed Make C++ Project';
 screenText[6]='Select a Target';
 screenText[7]='Error Parser 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';
+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';
+
 
 
 function nav_a() {	
-					document.back.src='../images/back.gif';  
+					document.back.src='../images/icon_back.png';  
 					document.back.title='Back';
 					
-					document.home.src='../images/home.gif';  
+					document.home.src='../images/icon_previous.png';  
 					document.home.title='Start Over'; 
 					
-					document.next.src='../images/next.gif';  
+					document.next.src='../images/icon_forward.png';  
 					document.next.title='Next';  
 				 };
 				 
@@ -102,15 +107,15 @@ function nav_b() {
 					document.home.src='../images/trans.gif'; 
 					document.home.title=''; 
 					
-					document.next.src='../images/next.gif';  
+					document.next.src='../images/icon_forward.png';  
 					document.next.title='Next';  
 				 };
 				 
 function nav_e() {	
-					document.back.src='../images/back.gif';  
+					document.back.src='../images/icon_back.png';  
 					document.back.title='Back';
 					
-					document.home.src='../images/home.gif';  
+					document.home.src='../images/icon_previous.png';  
 					document.home.title='Start Over'; 
 					
 					document.next.src='../images/trans.gif';
@@ -147,12 +152,12 @@ function goBack() {
 <body>
 <h2>C/C++ Development Toolkit (CDT) Managed Make Tutorial</h2>
 <center>
-<IFRAME name=textFrame SRC="cdt_w_basic01.htm" TITLE="cdt_w_basic Text" MARGINWIDTH=0 MARGINHEIGHT=0 width=800 height=150 frameborder=0 SCROLLING=auto></IFRAME>
+<IFRAME name=textFrame SRC="cdt_w_basic01.htm" TITLE="cdt_w_basic Text" MARGINWIDTH=0 MARGINHEIGHT=0 width=800 height=180 frameborder=0 SCROLLING=auto></IFRAME>
 <table width="600px" border="0" cellspacing="0" summary="">
 	<tr>
-		<td><img src="../images/trans.gif" align="left" width="16" height="16" onClick="goBack();" title="" name="back"></td>
-		<td><center><img src="../images/trans.gif" width="16" height="16" onClick="reset();" title="" name="home"></center></td>
-		<td><img src="../images/next.gif" align="right" width="16" height="16" onClick="goNext();" title="Next" name="next" ></td>
+		<td><img src="../images/trans.gif" align="left" width="22" height="22" onClick="goBack();" title="" name="back"></td>
+		<td><center><img src="../images/trans.gif" width="22" height="22" onClick="reset();" title="" name="home"></center></td>
+		<td><img src="../images/icon_forward.png" align="right" width="22" height="22" onClick="goNext();" title="Next" name="next" ></td>
 	</tr>
 </table>
 <p><img src="../images/cdt_w_basic01.png" align="center" width="800" height="600" alt="Eclipse Logo" name="screen" ></p>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic03.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic03.htm
index 969dccb8120..8d58fbdabde 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic03.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic03.htm
@@ -5,13 +5,16 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+	<script language="JavaScript">
+		function newWin(url) {
+		window.open(url, 'hello_world_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');}
+	</script>
 </head>
 <body>
 <h3>C/C++ Perspective</h3>
 
-<p>This is the C/C++ Perspective, notice the C/C++ Projects view on the left, and the Outline view has moved to the right.  The center area is reserved for your <b>Edit</b> view.</p>
-<p>There may be other views available in your workbench such as the <b>Navigator</b> or <b>Make Targets</b> views.  You can close them if you wish; they will not be used in this tutorial.  
-You can open them again later by clicking <b>Window > Show View</b> and reselecting them.
+<p>This is the <a href="javascript:void(0)" onClick="newWin('../concepts/cdt_c_perspectives.htm')">C/C++ Perspective</a>, notice the C/C++ Projects view on the left, and the Outline view has moved to the right.  The center area is reserved for your <b>Edit</b> view.</p>
+<p>There may be other views available in your workbench such as the <b>Navigator</b> or <b>Make Targets</b> views.  
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic04.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic04.htm
index baef3a40c6b..17a1362c4e5 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic04.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic04.htm
@@ -5,11 +5,15 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+	<script language="JavaScript">
+		function newWin(url) {
+		window.open(url, 'hello_world_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');}
+	</script>
 </head>
 <body>
 <h3>Create a project</h3>
 
-<p>You can now create a C/ C++ project by clicking <b>File > New > Project</b>.</p>
+<p>You can now create a <a href="javascript:void(0)" onClick="newWin('../concepts/cdt_c_projects.htm')">C/ C++ project </a>by clicking <b>File > New > Project</b>.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic05.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic05.htm
index d69c0736ca7..602e3836f80 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic05.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic05.htm
@@ -9,7 +9,7 @@
 <body>
 <h3>New Project Wizard</h3>
 
-<p>You will now see the <b>New Project</b> wizard.  Open a C or C++ project and select Standard Make or Managed Make project.  
+<p>You will now see the <b>New Project</b> wizard.  Open a C or C++ project and select Managed Make project.  
 A Standard Make C/C++ project requires you to provide a makefile, a Managed Make project will create one for you.</p>
 
 </body>
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 229c9c03e5f..15620309432 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
@@ -8,7 +8,7 @@
 </head>
 <body>
 <h3>Select a Target</h3>
-<p>Select the Deployment Platform and Configuration(s) for your project.</p>
+<p>Select the Executable Build Target, appropriate for your operating system.</p>
 <p>Click <b>Next</b>.</p>
 
 </body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic08.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic08.htm
index ba990acf092..0c3f265d02f 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic08.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic08.htm
@@ -9,7 +9,7 @@
 <body>
 <h3>Additional Project Settings</h3>
 <p>Click the <b>Error Parsers</b> tab, select the Error Parsers you require for the project.  
-You can also change the order in which Error Parsers are called.</p>
+You can also change the order in which Error Parsers are called.  You can select all of them if you choose.</p>
 <p>Click <b>Finish</b> to close the dialog box.</p>
 
 </body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic09.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic09.htm
index 29cdd622a73..891fd1e5438 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic09.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic09.htm
@@ -7,9 +7,9 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>New Project</h3>
-
-<p>You should now see the new project in the C/C++ Projects view.</p>
+<h3>Additional Project Settings</h3>
+<p>Click the <b>C/C++ Indexer</b> tab, ensure Enable C/C++ Indexing is selected, otherwise search capabilities, and other tools that require search, will be disabled for your project.  
+<p>Click <b>Finish</b> to close the dialog box.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic13.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic13.htm
index ff1ec66fd27..45eca65a890 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic13.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic13.htm
@@ -6,16 +6,12 @@
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
-<script language="JavaScript">
-function newWin(url) {
-window.open(url, 'hello_world_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');}
-</script>
-
 <body>
-<h3>Enter code</h3>
+<h3>New Project Files</h3>
+
+<p>You should now see the new file located in the Projects View under the project, and the new file should be open in the <b>Editor</b> view.</p> 
+
 
-<p>Enter the code in the cpp file that was just created. You can get the code shown below click <a href="javascript:void(0)" onClick="newWin('hw_example.htm')">here</a>.</p>
-<p>You will notice an asterisk in front of the file name on the tab in the <b>Editor</b> view, this tells you the file changed but has not been saved.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic15.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic15.htm
index f0d1e21ca12..7cb80a8d75c 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic15.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic15.htm
@@ -7,10 +7,11 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Save the file</h3>
+<h3>Step through the code</h3>
+
+<p>You will also see the <b>Outline</b> view has also been populated with objects created from your code.  </p>
+<p>If you select an item from the <b>Outline</b> view the corresponding text in the editor is highlighted.</p>
 
-<p>Now save the cpp file, if you have <b>Build Automatically</b> selected under your <b>Projects</b> menu list, you can read through the build messages in the <b>Console</b> view.</p>
-<p>If <b>Build Automatically</b> is not selected, after you save the file you can build by typing <b>CTRL+B</b>.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic16.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic16.htm
index b6d0f5ec86f..855b1f6500a 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic16.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic16.htm
@@ -7,11 +7,11 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>View Executable</h3>
-
-<p>Navigate to the <b>C/C++ Projects</b> view  and expand the Binary object, you will now see the executables listed. 
-If you selected Debug options in your Makefile (as are default in a Managed Make project), the executables will be listed there as well. <p>
+<h3>Save the file</h3>
 
+<p>Now save the main.cpp file, and build your project by typing <b>CTRL+B</b>.</p>
+<p>You can read through the build messages in the <b>Console</b> view, the project should build successfully showing the following message:</br>
+<tt>Build complete for project HelloWorld</tt></p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic17.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic17.htm
index 886c6cce8a4..1d9d38db18a 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic17.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic17.htm
@@ -7,9 +7,9 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Run the application</h3>
+<h3>View Executable</h3>
 
-<p>You can run your application within the C/C++ Perspective, to do so click <b>Run > Run</b>.<p>
+<p>Navigate to the <b>C/C++ Projects</b> view  and expand the Binary object, you will now see the executables listed if you selected Debug options in your Makefile (default for a Managed Make project). <p>
 
 
 </body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic22.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic22.htm
index d986d5570ce..26b2431c84a 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic22.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic22.htm
@@ -7,9 +7,12 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Run complete</h3>
+<h3>Console View</h3>
 
-<p>The title bar in the <b>Console</b> view will show you when the program has terminated.</p>
+<p>You should now see the application running in the <b>Console</b> view.  
+The <b>Console</b> will also show which application is running in a title bar.  
+You will notice that the view can be configured to display different elements (such as user input elements) in different colors.</p>
+<p>Type in your name and hit Enter.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm
index 50fcb90013a..f7be1a9aadb 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm
@@ -11,36 +11,52 @@
 
 <h1>How to bring C/C++ source files into Eclipse</h1>
 
-<p>A common scenario that you may encounter when starting to use the CDT, is 
-determining how 
+<p>A common scenario that you may encounter when starting to use the CDT, is determining how 
 to bring existing C/C++ source files into Eclipse. There are a number of ways to 
 do this. The scenarios described below are recommended approaches.</p>
 
-<h2>Create new projects for existing source roots</h2>
+<h2>Create a project from CVS</h2>
+
+<p>If your existing source tree is managed in CVS, you can use the CVS 
+Repository perspective to &quot;Checkout As...&quot; any folder in the repository. 
+The first time you &quot;Checkout As...&quot;, the New Project wizard is launched and you need to 
+create a C or C++ project for the folder. For more information, see
+<a href="../tasks/cdt_t_proj_new.htm">Creating a project</a> and
+<a href="../tasks/cdt_o_proj_files.htm">Working with C/C++ project files</a>.</p>
+
+<p>A CVS checkout of the project into the project's location occurs.  It is recommended that you eventually add and commit the CDT project files aback into CVS.  
+The CDT project files include .project, .cdtproject and .cdtbuild (for Managed Build projects) and are located at the root folder of each CDT project.</p>
+
+
+<h2>Create new projects from existing source roots</h2>
 
-<p>If you can access the source  from your desktop using the command 
-line, then you can make the root source folders Eclipse projects. This is accomplished by 
-creating a C/C++ Standard Make Project. For more information, see
+If your resource code is not managed in CVS but is available from the file system, then you need to perform two steps:
+<ol>
+	<li>Identify a "root folder" of your source code tree.</li>
+	<li>Create a new C/C++ project using the New Project Wizard, and specify the "root folder" as a non-default location of the new project.</li>
+</ol>
+<p>Typically existing projects will have their own makefiles, so you should create a new Standard Make C/C++ project.  For more information see 
 <a href="../tasks/cdt_t_proj_new.htm">Creating a project</a> and
-<a href="../tasks/cdt_o_proj_prop.htm">Defining project properties</a>.</p>
+<a href="../tasks/cdt_o_proj_files.htm">Working with C/C++ project files</a>.</p>
+
+<p>To help you to identify a root folder for your project, consider the following guidelines:
+<ul>
+	<li>all source code for the project is available on or beneath the root folder</li>
+	<li>the build results are also produced in or beneath the root folder</li>
+	<li>there is often a makefile in the root folder.  In complex projects, the makefile in the root folder calls other makefiles in other directories to produce the build results.</li>
+	<li>external header files and library files do not need to be in or beneath the root folder.</li>
+</ul></p>
 
 <p>The resources for the project are maintained in the remote location specified, 
 not in the workspace folder for Eclipse. However, your existing folder structure 
 is displayed in the C/C++ Projects view. Meta data for the project, such as the 
 index for the project and the link to the existing source, is stored in the metadata 
 directory in the workspace folder. For more information on the workspace folder, 
-see <b>Workbench User Guide &gt; Tasks &gt; Importing &gt; Upgrading Eclipse</b>.</p>
-
-<h2>Create a project from CVS</h2>
-
-<p>If your existing source tree is managed in CVS, you can use the CVS 
-Repository perspective to &quot;Checkout As...&quot; any folder in the repository. 
-The first time you &quot;Checkout As...&quot;, the New Project wizard is launched and you need to 
-create a C or C++ project for the folder. For more information, see
-<a href="../tasks/cdt_t_proj_new.htm">Creating a project</a> and
-<a href="../tasks/cdt_o_proj_prop.htm">Defining project properties</a>.</p>
+see <b>Workbench User Guide &gt; Tasks &gt; Upgrading Eclipse</b>.</p>
 
-<p>A CVS checkout of the project into the project's location occurs.</p>
+Once you create a CDT project, you cannot easily move it or redefine its root folders.  
+If you need to, you can delete the CDT project (without deleting its contents) and then 
+recreate it specifying a different non-default location.
 
 <h2>Import your C/C++ source file system</h2>
 
@@ -50,20 +66,21 @@ existing file system.
 For more information, see <b>Workbench User Guide &gt; Tasks &gt; Importing &gt; 
 Importing resources from the file system</b>.</p>
 
-<p>This approach&nbsp;copies the files from your file system to an Eclipse Workbench 
+<p>This approach copies the files from your file system to an Eclipse Workbench 
 project or folder. Your original source files remain unchanged and it is the 
 copies of the files that will be edited, built and debugged using the CDT.&nbsp; 
 When you have successfully imported your existing file system, the folder 
-structure is displayed in the C/C++ Projects view.</p>
+structure is displayed in the C/C++ Projects view.  Again, you should identify an
+appropriate "root folder" to import from.</p>
 
-<p><b>Tip:</b></p>
+<p><b>Tip:</b>
 
 <ul>
   <li>Importing your existing file system can consume significant disk space 
   depending on the size of your files.</li>
   <li>Your files may become detached from an existing source control system that 
   previously referenced the original file location such as a ClearCase view.</li>
-</ul>
+</ul></p>
 
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm
index 7b7683665c2..1075576d0a2 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm
@@ -24,43 +24,45 @@ function changeSize(theImage,wd,ht) {
 
 <ol>
 	<li>Click <b>Help > Software Updates > Find and Install</b>.<br>
-	<img src="../images/cdt_update_find-install.png" width="319" height="85" onClick="changeSize(this,319,85);" 
-         alt="Screen Capture of Help Find Install Menu selection" title="click to toggle image size"></li>
-	<li>Select <b>Search for new features to install</b> in the Install dialog box.<br>
-	<img src="../images/cdt_update_install_new.png" width="221" height="126" onClick="changeSize(this,221,126);" 
-    	 alt="Screen Capture of Install New Feature dialog box" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_find-install.png" alt="Help, Software Updates,  Find and Install Menu selection"><br>&nbsp;</li>
+	
+	<li>In the <b>Feature Updates</b> window select <b>Search for new features to install</b> and click <b>Next</b>.<br>
+	<img src="../images/cdt_update_install_new.png" alt="Feature Updates dialog box"><br>&nbsp;</li>
+	
+	
 	<li>If you have not updated previously, you will have to enter the location of the CDT Install site. Click
 		the <b>Add Update Site...</b> button.<br>
-	<img src="../images/cdt_update_install_sites.png" width="221" height="200" onClick="changeSize(this,221,200);" 
-    	 alt="Screen Capture of Install Sites dialog box" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_install_sites.png" alt="Add Update Sites dialog box"><br>&nbsp;</li>
+	
 	<li>In the New Update Site dialog box, enter a name and the URL for the update site in the spaces provided.<br> 
-	<img src="../images/cdt_update_install_new_sites.png" width="220" height="200" onClick="changeSize(this,220,200);" 
-    	 alt="Screen Capture of Install New Site dialog box" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_install_new_sites.png" alt="Install New Site dialog box"><br>&nbsp;</li>
+	
  	<li>Select the update site you just created by clicking the appropriate checkbox and click <b>Next</b>.<br>
-	<img src="../images/cdt_update_install_cdt_site.png" width="220" height="200" onClick="changeSize(this,220,200);" 
-	     alt="Screen Capture of Install Sites dialog box with the CDT site selcted" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_install_cdt_site.png" alt="Install Sites dialog box with the CDT site selcted"><br>&nbsp;</li>
+	
 	<li>A dialog box will appear showing the updates available from the update site, select each of the following features, 
 		ensuring you have precisely the same version for each one:
 		<ul>
+			<li>Eclipse C/C+ Development Tooling SDK</li>
 			<li>Eclipse C/C+ Development Tools</li>
-			<li>Eclipse C/C+ Manage Make Build</li>
-			<li>Eclipse C/C+ Standard Make Build</li>
 		</ul>
 		Then click <b>Next</b>.<br>
-	<img src="../images/cdt_update_search_results.png" width="289" height="201" onClick="changeSize(this,289,201);" 
-    	 alt="Screen Capture of Search Results dialog box" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_search_results.png" alt="Search Results dialog box"><br>&nbsp;</li>
+	
 	<li>You should now see the Eclipse.org Software User Agreement, you must accept the agreement to install the CDT update.
 		Do so by selecting <b>I accept the terms in the license agreement</b> and then click <b>Next</b>.<br>
-	<img src="../images/cdt_update_license_agreement.png" width="365" height="200" onClick="changeSize(this,365,200);" 
-    	 alt="Screen Capture of the Feature License dialog box" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_license_agreement.png" alt="Feature License dialog box"><br>&nbsp;</li>
+	
 	<li>Now select the location you would like the updates installed, usually this is the directory where you installed Eclipse,
 		and click <b>Finish</b>.<br>
-	<img src="../images/cdt_update_location.png" width="300" height="200" onClick="changeSize(this,300,200);" 
-    	 alt="Screen Capture of Install Location dialog box" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_location.png" alt="Install Location dialog box"><br>&nbsp;</li>
+	
 	<li>You will now start downloading the CDT components.  You will have to verify that you want the features installed by clicking
 		<b>Install</b> for each feature you selected.<br>
-	<img src="../images/cdt_update_jar_verification.png" width="300" height="250" onClick="changeSize(this,300,250);" 
-    	 alt="Screen Capture of Feature Verification dialog box" title="click to toggle image size"></li>
+	<img src="../images/cdt_update_jar_verification.png"alt="Feature Verification dialog box"><br>&nbsp;</li>
+	
+	<li>You will now have to restart Eclipse, select <b>Yes</b> to complete the update.<br>
+	<img src="../images/cdt_restart.png" alt="Install/Update prompt to restart Eclipse">
 </ol>
 <p><img border="0" src="../images/ngconcepts.gif" ALT="Related concepts" width="143" height="21">
 <br>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm
index 2a2181ce0c4..e436755fa56 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm
@@ -6,14 +6,6 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>Preparing the Workbench</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>
@@ -37,20 +29,17 @@ To reset the current perspective to its original layout, from the menu bar choos
 <ol>
 <br><li>Open the Workbench preferences: from the menu bar, select <b>Window &gt; Preferences</b>.</li>
 <br><li>Expand the <b>C/C++</b> heading and click on <b>C/C++ Editor</b>. The <b>Preferences C/C++ Editor</b> dialog's <b>General</b> tab appears.
-<p><img src="../images/editor_general_preferences.png" width="335" height="334" onClick="changeSize(this,335,304);" 
-       alt="C/C++ Editor Preferences General page" title="click to toggle image size"></li>
+<p><img src="../images/editor_general_preferences.png" alt="C/C++ Editor Preferences General page"></li>
 <br><li>Make any changes that you require to be comfortable editing files. 
 For example, you may want to enable <b>Show line numbers</b> or you may want to make the <b>Problem indicator color</b> a different shade of red. For more information see the <a href="../reference/cdt_u_c_editor_gen.htm">General page Preferences window</a> in the reference section.</li>
 
 <br><li>On the <b>Preferences C/C++ Editor</b> dialog, click the <b>Colors</b> tab. The <b>Preferences C/C++ Editor</b> dialog's <b>Colors</b> tab appears.</p>
-<img src="../images/editor_color_preferences.png" width="335" height="334" onClick="changeSize(this,335,304);" 
-       alt="C/C++ Editor Preferences Color page" title="click to toggle image size">
+<img src="../images/editor_color_preferences.png" alt="C/C++ Editor Preferences Color page">
 
 <br>Again, make any changes that will be useful for your working habits and click <b>OK</b>. For more information see the <a href="../reference/cdt_u_c_editor_color.htm">Color page Preferences window</a> in the reference section.</li>
 
 <br><li>On the <b>Preferences C/C++ Editor</b> dialog, click the <b>Content Assist</b> tab. The <b>Preferences C/C++ Editor</b> dialog's <b>Content Assist</b> tab appears.<br>
-<img src="../images/contentAssist_preferences.png" width="333" height="263" onClick="changeSize(this,334,263);" 
-       alt="C/C++ Editor Preferences Content Assist page" title="click to toggle image size">
+<img src="../images/contentAssist_preferences.png" alt="C/C++ Editor Preferences Content Assist page">
 <br>If you want to set an auto-activation delay or change the background for completion proposals, do so now. For more information see the <a href="../reference/cdt_u_c_editor_con_assist.htm">Content Assist page Preferences window</a> in the reference section.</li>
 <br><li>Leave the preferences by clicking <b>OK</b>.</li>
 </ol>
@@ -67,4 +56,4 @@ For example, you may want to enable <b>Show line numbers</b> or you may want to
 
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard.htm
index 5c3cad44f9e..943075ed70b 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard.htm
@@ -105,13 +105,13 @@ screenText[27]='Console View with Program Terminated';
 
 
 function nav_a() {	
-					document.back.src='../images/back.gif';  
+					document.back.src='../images/icon_back.png';  
 					document.back.title='Back';
 					
-					document.home.src='../images/home.gif';  
+					document.home.src='../images/icon_previous.png';  
 					document.home.title='Start Over'; 
 					
-					document.next.src='../images/next.gif';  
+					document.next.src='../images/icon_forward.png';  
 					document.next.title='Next';  
 				 };
 				 
@@ -122,15 +122,15 @@ function nav_b() {
 					document.home.src='../images/trans.gif'; 
 					document.home.title=''; 
 					
-					document.next.src='../images/next.gif';  
+					document.next.src='../images/icon_forward.png';  
 					document.next.title='Next';  
 				 };
 				 
 function nav_e() {	
-					document.back.src='../images/back.gif';  
+					document.back.src='../images/icon_back.png';  
 					document.back.title='Back';
 					
-					document.home.src='../images/home.gif';  
+					document.home.src='../images/icon_previous.png';  
 					document.home.title='Start Over'; 
 					
 					document.next.src='../images/trans.gif';
@@ -170,9 +170,9 @@ function goBack() {
 <IFRAME name=textFrame SRC="cdt_w_standard01.htm" TITLE="cdt_w_standard Text" MARGINWIDTH=0 MARGINHEIGHT=0 width=800 height=150 frameborder=0 SCROLLING=auto></IFRAME>
 <table width="600px" border="0" cellspacing="0" summary="">
 	<tr>
-		<td><img src="../images/trans.gif" align="left" width="16" height="16" onClick="goBack();" title="" name="back"></td>
-		<td><center><img src="../images/trans.gif" width="16" height="16" onClick="reset();" title="" name="home"></center></td>
-		<td><img src="../images/next.gif" align="right" width="16" height="16" onClick="goNext();" title="Next" name="next" ></td>
+		<td><img src="../images/trans.gif" align="left" width="22" height="22" onClick="goBack();" title="" name="back"></td>
+		<td><center><img src="../images/trans.gif" width="22" height="22" onClick="reset();" title="" name="home"></center></td>
+		<td><img src="../images/icon_forward.png" align="right" width="22" height="22" onClick="goNext();" title="Next" name="next" ></td>
 	</tr>
 </table>
 <p><img src="../images/cdt_w_standard01.png" align="center" width="800" height="600" alt="Eclipse Logo" name="screen" ></p>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard03.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard03.htm
index 969dccb8120..1d72f4ce4c6 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard03.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard03.htm
@@ -4,14 +4,16 @@
 	<meta http-equiv="Content-Language" content="en-us">
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
+	<script language="JavaScript">
+		function newWin(url) {
+		window.open(url, 'hello_world_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');}
+	</script>
 </head>
 <body>
 <h3>C/C++ Perspective</h3>
 
-<p>This is the C/C++ Perspective, notice the C/C++ Projects view on the left, and the Outline view has moved to the right.  The center area is reserved for your <b>Edit</b> view.</p>
-<p>There may be other views available in your workbench such as the <b>Navigator</b> or <b>Make Targets</b> views.  You can close them if you wish; they will not be used in this tutorial.  
-You can open them again later by clicking <b>Window > Show View</b> and reselecting them.
+<p>This is the <a href="javascript:void(0)" onClick="newWin('../concepts/cdt_c_perspectives.htm')">C/C++ Perspective</a>, notice the C/C++ Projects view on the left, and the Outline view has moved to the right.  The center area is reserved for your <b>Edit</b> view.</p>
+<p>There may be other views available in your workbench such as the <b>Navigator</b> or <b>Make Targets</b> views.  
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm
index baef3a40c6b..17a1362c4e5 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm
@@ -5,11 +5,15 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+	<script language="JavaScript">
+		function newWin(url) {
+		window.open(url, 'hello_world_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');}
+	</script>
 </head>
 <body>
 <h3>Create a project</h3>
 
-<p>You can now create a C/ C++ project by clicking <b>File > New > Project</b>.</p>
+<p>You can now create a <a href="javascript:void(0)" onClick="newWin('../concepts/cdt_c_projects.htm')">C/ C++ project </a>by clicking <b>File > New > Project</b>.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm
index 058e4bd7019..88fba2d4d01 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm
@@ -7,11 +7,11 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Make Builder Settings</h3>
+<h3>Project Refereneces</h3>
 
-<p>Click the <b>Make Builder</b> tab.  Depending on your operating environment, you may need to change your <b>Build Command</b> from default.  Deselect the<b> Use default</b> checkbox and
-enter the build command in the text box. It is recommended you leave the <b>Build on resource save</b> unchecked, otherwise whenever a file is 
-saved in your project the project will perform a build which can become time consuming for large projects.</p>
+<p>Now you will select your preferences for the project. <p>
+<p>This page is where you would select other referenced C/C++ projects, 
+since this is a simple Hello World project you will not need to make any selections here.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm
index d46e1f1cfa1..8bca5593b68 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm
@@ -7,9 +7,10 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Error Parsers</h3>
-<p>Click the <b>Error Parsers</b> tab, select the Error Parsers you require for the project.  
-You can also change the order in which Error Parsers are called.</p>
+<h3>Make Builder Settings</h3>
+
+<p>Click the <b>Make Builder</b> tab.  If your build environment has a build command that is not <tt>make</tt>, you need to change your <b>Build Command</b> from the default. 
+To do so deselect the <b>Use default</b> checkbox and enter the build command in the text box.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm
index 80658bc6da4..123da06a586 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm
@@ -7,11 +7,10 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Binary Parser Settings</h3>
-<p>Click the <b>Binary Parser</b> tab, select the Binary Parsers you require for the project.  
-<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>
-
+<h3>Error Parsers</h3>
+<p>Click the <b>Error Parsers</b> tab, select the Error Parsers you require for the project.  
+You can also change the order in which Error Parsers are called.</p>
+<p>By default you can leave all parsers selected.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm
index 6b89a88d5f2..11c7854bf4d 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm
@@ -7,12 +7,12 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Paths and Symbols</h3>
-<p>Click the <b>Paths and Symbols</b> tab, you can define include paths and preprocessor symbols for the parser. 
-This enables the parser to understand the contents of the C/C++ source 
-code so that you may more effectively use the search and code completion 
-features. Include paths are also used by the builder to locate files that 
-are not in the workspace.</p>
+<h3>Binary Parser Settings</h3>
+<p>Click the <b>Binary Parser</b> tab, select the Binary Parsers you require for the project, and in which order they are to be used.  
+<p>It is important you chose the proper parser settings to ensure the accuracy of the <b>C/C++ Projects</b> 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 <b>C/C++ Projects</b> view.</p>
 
 
 </body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard11.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard11.htm
index 946f9efe6c8..8cf70f52cbd 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard11.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard11.htm
@@ -7,9 +7,11 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Indexer</h3>
-
-<p>You can enable or disable the indexer here.  The indexer is necessary for search and related features, like content assist.</p>
+<h3>Discovery Options</h3>
+<p>Click the <b>Discovery Options</b> tab.  This page defines the configuration for autodiscovery of include paths and preprocessor symbols for the parser which 
+enables the parser to understand the contents of the C/C++ source code so that you may more effectively use the search and code completion features. 
+Include paths are also used by the builder to locate files that are not in the workspace.</p>
+<p>Select the <b>Automate scanner configuration discovery</b> checkbox to configure the scanner discovery to run automatically.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard12.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard12.htm
index 3be044ea419..7f1d97d93db 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard12.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard12.htm
@@ -7,10 +7,11 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>New Project</h3>
-
-<p>You should now see the new project in the C/C++ Projects view.</p>
+<h3>C/C++ Indexer</h3>
 
+<p>You can enable or disable the C/C++ Indexer here.  
+The indexer is necessary for search and related features, like content assist and refactoring.  
+While there may be situations where the indexer is not required, for this project you can leave it enabled.</p>
+<p>When you have completed setting your C/C++ project preferences, click <b>Finish</b>.
 </body>
-
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm
index 829a80acbbd..ada483e64a0 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm
@@ -7,10 +7,9 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Create a file</h3>
+<h3>Create a makefile</h3>
 
-<p>You should now see the <b>New File</b> wizard.</p> 
-<p>Enter the name of your file in the <b>File name</b> text area then click <b>Finish</b>.</p>
+<p>Create the makefile by right clicking your project and selecting <b>New > File</b>.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm
index 3983ab42fe2..d63d9caf02f 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm
@@ -7,9 +7,9 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Create a makefile</h3>
+<h3>New Makefile</h3>
 
-<p>Create a new makefile by right clicking your project and selecting <b>New > File</b>.</p>
+<p>You should now see the new makefile located in the <b>Projects</b> view under the project, and the makefile should be open in the <b>Editor</b> view.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm
index 8466028b5cf..2ae8e55c463 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm
@@ -5,12 +5,18 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+<script language="JavaScript">
+function newWin(url) {
+window.open(url, 'make_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
+}
+</script>
 </head>
 <body>
-<h3>Create a makefile</h3>
+<h3>Enter the make script</h3>
 
-<p>You should now see the <b>New File</b> wizard.</p> 
-<p>Enter <b>makefile</b> for the name of the file in the <b>File name</b> text area then click <b>Finish</b>.</p>
+<p>Enter the build instruction for your <a href="javascript:void(0)" onClick="newWin('make_example.htm')" title="Click here to get the code">makefile</a> that was just created.
+When you enter the code you will notice an asterisk in front of the file name on the tab in the <b>Editor</b> view, this tells you the file changed but has not been saved.</p>
 
+<p><i>Note: Ensure you have tabs, not spaces before your indented code, as </i><tt>make</tt><i> will not accept spaces before commands.</i></p>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard18.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard18.htm
index 7d561b99c49..89275a5ae05 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard18.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard18.htm
@@ -7,9 +7,9 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>New Makefile</h3>
+<h3>Create a CPP file</h3>
 
-<p>You should now see the new makefile located in the Projects View under the project, and the makefile should be open in the <b>Editor</b> view.</p>
+<p>Create the main.cpp file by right clicking your project and selecting <b>New > File</b>.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard19.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard19.htm
index 0f2a7cbab7b..21ffe11f5a6 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard19.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard19.htm
@@ -5,16 +5,12 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
-<script language="JavaScript">
-function newWin(url) {
-window.open(url, 'make_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
-}
-</script>
 </head>
 <body>
-<h3>Enter the make script</h3>
+<h3>Create a CPP file</h3>
+
+<p>You should now see the <b>New File</b> wizard.</p> 
+<p>Enter <b>main.cpp</b> in the <b>File name</b> text area then click <b>Finish</b>.</p>
 
-<p>Enter the script for your makefile that was just created. You can get the code shown below click <a href="javascript:void(0)" onClick="newWin('make_example.htm')">here</a>.</p>
-<p><i>Note: Ensure you have tabs, not spaces before your indented code, some parsers do not accept spaces.</i></p>
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard20.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard20.htm
index 0f88183db07..fa9fc446e93 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard20.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard20.htm
@@ -5,18 +5,13 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
-<script language="JavaScript">
-function newWin(url) {
-window.open(url, 'hello_world_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
-}
-</script>
 </head>
 <body>
-<h3>Enter code</h3>
+<h3>New Project Files</h3>
+
+<p>You should now see the <b>main.cpp</b> file located in the <b>Projects</b> view under the project, 
+and the <b>main.cpp</b> file should be open in the <b>Editor</b> view..</p>
 
-<p>Enter the code in the cpp file that was just created. You can get the code shown below click <a href="javascript:void(0)" onClick="newWin('hw_example.htm')">here</a>.</p>
-<p><i>Note: Leave a blank line at the end of the code, some compilers require one.</i></p>
-<p>You will notice an asterisk in front of the file name on the tab in the <b>Editor</b> view, this tells you the file changed but has not been saved.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard21.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard21.htm
index 01e1cf298c4..b0ddba6da87 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard21.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard21.htm
@@ -5,13 +5,19 @@
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 	<title>Tutorial</title>
 	<link rel="stylesheet" type="text/css" href="../help.css">
+<script language="JavaScript">
+function newWin(url) {
+window.open(url, 'hello_world_example', 'width=400, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
+}
+</script>
 </head>
 <body>
-<h3>Save the files</h3>
+<h3>Enter code</h3>
 
-<p>Now save the makefile and cpp file, if you have <b>Build Automatically</b> selected under your <b>Projects</b> menu list, you can read through the build messages in the <b>Console</b> view.</p>
-<p>If <b>Build Automatically</b> is not selected, after you save the file you can build by typing <b>CTRL+B</b>.</p>
+<p>Enter the code in the <a href="javascript:void(0)" onClick="newWin('hw_example.htm')" title="click here to get the code">main.cpp</a> file that was just created.
+You can double click the <b>main.cpp</b> tab in the <b>Editor</b> view to expand the view. </p>
 
+<p><i>Note: Leave a blank line at the end of the code, some compilers require one.</i></p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard22.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard22.htm
index 087d0033c7a..f87a2554d7d 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard22.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard22.htm
@@ -7,13 +7,10 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Run the application</h3>
-
-<p>Navigate to the <b>C/C++ Projects</b> view,  you will now see the executables listed. </p>
-
-<p>You can run your application within the C/C++ Perspective, to do so click <b>Run > Run</b>.</p>
-
+<h3>Build the project</h3>
 
+<p>Save the <b>makefile</b> and <b>main.cpp</b> files by selecting them and typing <b>CTRL+S</b>, and then build your project by typing <b>CTRL+B</b>.  </p>
+<p>You can read through the build messages in the <b>Console</b> view, if there are any errors in the code you can review them in the <b>Problems</b> view.</p>
 
 
 </body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard25.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard25.htm
index 335472b76bc..85bef0d9243 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard25.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard25.htm
@@ -7,9 +7,8 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Program Selection</h3>
-
-<p>The <b>Program Selection</b> dialog box will appear, select the executable you would like to run and click <b>OK</b>.<p>
+<h3>Run Configuration</h3>
+<p>Select the new Run Configuration in the <b>Configurations:</b> view and click the <b>Main</b> tab.  This is where you select your C/C++ Application.</p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard26.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard26.htm
index e3f90eb86e5..13dcd35afc2 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard26.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard26.htm
@@ -7,11 +7,9 @@
 	<link rel="stylesheet" type="text/css" href="../help.css">
 </head>
 <body>
-<h3>Run Configuration</h3>
-
-<p>The executable file should appear in the <b>C/C++ Application</b> text area.</p>
-<p>Click <b>Apply</b>, and then click <b>Run</b> to run the application.</p>
+<h3>Program Selection</h3>
 
+<p>Enter <b>hello.exe</b> in the <b>C/C++ Application</b> field then click <b>Apply</b> and then <b>Run</b>.<p>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard27.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard27.htm
index 3ec6a6cc9bf..26b2431c84a 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard27.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard27.htm
@@ -9,8 +9,10 @@
 <body>
 <h3>Console View</h3>
 
-<p>You should now see the application running in the <b>Console</b> view.  The <b>Console</b> will also show which application is running in a title bar.</p>
-<p>You will notice that the view can be configured to display different elements (such as user input elements) in different colors.</p>
+<p>You should now see the application running in the <b>Console</b> view.  
+The <b>Console</b> will also show which application is running in a title bar.  
+You will notice that the view can be configured to display different elements (such as user input elements) in different colors.</p>
+<p>Type in your name and hit Enter.</p>
 
 </body>
 </html>
\ No newline at end of file