diff --git a/doc/org.eclipse.cdt.doc.user/book.css b/doc/org.eclipse.cdt.doc.user/book.css
index 39391cd1cac..cd4e5a03c95 100644
--- a/doc/org.eclipse.cdt.doc.user/book.css
+++ b/doc/org.eclipse.cdt.doc.user/book.css
@@ -7,17 +7,17 @@ pre				{ font-family: Courier, monospace}
 /* end font face declarations */
 
 /* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
-pre				{ font-size: 10pt}
+body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 12pt; }
+pre				{ font-size: 12pt}
 
 /* end font size declarations */
 
 body	     { background: #FFFFFF}
 h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
 h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
+h3           { font-size: 12pt; margin-top: 20; margin-bottom: 3 }
 h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-p 	     { font-size: 10pt; }
+p 	     { font-size: 12pt; }
 pre	     { margin-left: 6; font-size: 9pt }
 
 a:link { color: #006699 }
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 362039642f3..a9d96fba0d4 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
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<title>New CDT Project with generated makefile - Tutorial</title>
-	<link rel="stylesheet" type="text/css" href="../help.css">
+	<link rel="stylesheet" type="text/css" href="../book.css">
 <script language="JavaScript">
 function newWin(url) {
 	window.open(url, 'install_cdt', 'width=900, height=700, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
@@ -17,90 +17,132 @@ function newWin(url) {
 This tutorial describes the process of creating a new C++ project where the build is
 automatically managed by the CDT, and running the program.</p>
 
-<p>Note: In earlier versions of the CDT, there were two separate project types:
+<p><strong>NOTE</strong>: In earlier versions of the CDT, there were two separate project types:
 Managed make (automatically generated a makefile)
 and Standard make (required the user's makefile to build).
-Now with CDT, you now select a project type, and that determines what build system will be used.</p>
+Now with CDT, you just select a project type, and that determines what build system to use.</p>
 
-<p>To create a simple "Hello World" application using the CDT, you will perform the following steps:</p>
-
-<h3> Step 1: Creating a project</h3>
+<p>To create a simple "Hello World" application using  CDT, perform the following general steps:</p>
 <ol>
-	<li>Select <strong>File &gt; New &gt; Project</strong>.</p>
-	<p><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic02.png')">Click here to see an illustration (displayed in a separate window)</a>.</p><br></li>
+    <li><a href="#cdt_create">Creating a project</a></li>
+    <li><a href="#cdt_build">Reviewing the code and building the project</a></li>
+    <li><a href="#cdt_running">Running the application</a></li>
+</ol>
+<hr>
+<h3> Step 1: <a name="cdt_create"></a>Creating a project</h3>
+<ol>
+	<li>Select <strong>File &gt; New &gt; Project</strong>.<br>
+	    <br>
+	    </p>
+	    <img src="../images/cdt_w_basic02.png" alt="Select File &gt; New &gt; Project menu option" width="591" height="183">
+	    <p><br>
+    </p>
+	</li>
 
-	<li>Select the type of project to create. For this tutorial, expand the <strong>C++</strong> folder and select <strong>C++ Project</strong> and click <strong>Next</strong>.
-	<p><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic03a.png')">Click here to see an illustration.</a><br></p>
-	<p><br>The <strong>C++ Project</strong> wizard opens.</p>
-	<a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic04.png')">Click here to see an illustration.</a><br></p>
-    <p><br>By default, the CDT filters the <strong>Toolchain</strong> and <strong>Project types</strong> that it displays in those lists based on the language support for the C++ Project wizard you selected for this tutorial.</p>
-    </li><br>
-    <li><p>In the <strong>Project name</strong> field, type a name for the project, such as <strong>Hello World</strong>.</p>
-    <br>
-    <li><p>From the <strong>Project types</strong> list, expand <strong>Executable</strong> and select <strong>Hello World C++ Project</strong>. This project type provides a simple Hello World application in C++, and the makefile is automatically created by the CDT.</p>
-	<br>
-    <li><p>Select a required toolchain from the <strong>Toolchain</strong> list.</p>
-    <br>
-    <p>A toolchain is a set of tools (such as a compiler, linker, and assembler) intended to build your project.
-    Additional tools, such as a debugger, can be associated with a toolchain.
-    There can be several toolchains available, depending on the compilers installed on your system.</p>
-    <br>
-    <li><p>Click <strong>Next</strong>.</p>
-    <br>
-    <p>The Select Configurations window displays a list of configurations based on the project type and toolchain(s) you selected earlier.
-    <br>
-    <a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic07.png')">Click here to see an illustration.</a></p>
-    <br>
-    <li><p>Optional: If you want to change the default project settings, click <strong>Advanced Settings</strong>.</p>
-    <br>
-    <p>This opens the project properties dialog for your new project allowing you change any of the project specific settings,
-    such as includes paths, compiler options, and libraries.</p>
-    <p><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic21.png')">Click here to see an illustration.</a></p>
-    <br>
-	<li>If you clicked <strong>Next</strong> at Step 6, you can specify the basic properties for the new project, such as your name, copyright, and source information.</p>
-	<p><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic22.png')">Click here to see an illustration.</a></p>
-	<br>
-    <li><p>Click <strong>Finish</strong>.</p>
-    <br>
-	<li><p>If the <strong>C++ perspective</strong> is not currently set as the default, you are prompted to determined if you would like to this project to be associated with the C/C++ perspective. Click <strong>Yes</strong>.
-	<br><p><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_cpp_perspectx.png')">Click here to see an illustration.</a></p>
-	<br>
-	<p>A project is created with the default settings and a full set of configurations based on the project type and toolchain you selected.
-	You should now see the new project in C/C++ Projects view.</p>
-	<p><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic12.png')">Click here to see an illustration.</a></p>
+	<li>Select the type of project to create. For this tutorial, expand the <strong>C++</strong> folder and select <strong>C++ Project</strong> and click <strong>Next</strong>.<br>
+	    <br>
+	    <img src="../images/cdt_w_basic03a.png" alt="Select project type" width="525" height="500"><br>    
+	    <br>
+	</li>
+	<li>
+	    <p>The <strong>C++ Project</strong> wizard opens.<br>
+	        </p>
+        </p>
+	    <p><img src="../images/cdt_w_basic04.png" width="525" height="576"><br>
+        <br>By default, the CDT filters the <strong>Toolchain</strong> and <strong>Project types</strong> that it displays in those lists based on the language support for the C++ Project wizard you selected for this tutorial.</p>
+    </li>
 	<br>
+    <ol type="a">
+        <li>In the <strong>Project name</strong> field, type a name for the project, such as <strong>HelloWorld</strong>.
+            <p><br>
+                </p>
+        </li>
+        <li>From the <strong>Project type</strong> list, expand <strong>Executable</strong> and select <strong>Hello World C++ Project</strong>. This project type provides a simple Hello World application in C++, and the makefile is automatically created by the CDT.
+            <p><br>
+                </p>
+        </li>
+        <li>Select a required toolchain from the <strong>Toolchain</strong> list.
+            <p><br>
+                </p>
+            <p>A toolchain is a set of tools (such as a compiler, linker, and assembler) intended to build your project.
+                Additional tools, such as a debugger, can be associated with a toolchain.
+                There can be several toolchains available, depending on the compilers installed on your system.</p>
+            <p><br>
+                </p>
+        </li>
+        <li>Click <strong>Next</strong>.    </li>
+    </ol>
 </ol>
 
-<h3>Step 2: Reviewing the code and building the project</h3>
+<ol start="4">
+    <li>Specify the <strong>Basic Properties</strong> for the new project, such as your author, copyright, and source information, then click <strong>Next</strong>.<br>
+        <br>
+        <img src="../images/cdt_w_basic06a.png" width="525" height="576"><br>
+        <br>
+    <li>
+    <p>The <strong>Select Configurations</strong> page displays a list of configurations based on the project type and toolchain(s)  selected earlier. <br>
+            <br>
+        <img src="../images/cdt_w_basic07.png" width="525" height="576"><br>
+                <br>
+                    <strong>OPTIONAL</strong>: If you want to change the default project settings, click <strong>Advanced Setting</strong> to open the <a href="../reference/cdt_u_prop_all.htm">Project Properties</a> dialog for your new project allowing you change any of the project specific settings,
+        such as includes paths, compiler options, and libraries.<br>
+        <br>
+    </p>
+    <li><p>Click <strong>Finish</strong>.<br>
+</p>
+    </ol>
+<p><strong>NOTE</strong> If the <strong>C++ perspective</strong> is not currently set as the default, you are prompted to determined if you would like to this project to be associated with the C/C++ perspective. Click <strong>Yes</strong>.<br>
+</p>
+<p>A project is created with the default settings and a full set of configurations based on the project type and toolchain you selected.
+        You should now see the new project in <a href="../reference/cdt_u_project_explorer_view.htm">Project Explorer</a> view.</p>
+<blockquote>
+    <p><img src="../images/cdt_w_basic12.png" width="423" height="283"></p>
+</blockquote>
+<hr>
+<br>
+<h3>Step 2: <a name="cdt_build" id="cdt_build"></a>Reviewing the code and building the project</h3>
 <ol>
-	<li>From the Project Explorer in the C++ Projects View, double-click the .cpp file that was created for your project, for example, <span class="typewriter">Hello World.cpp</span>. 
-	<p>Note that the file may be within a folder inside the project, e.g. the "src" folder.</p>
-	<p>This file opens in a default editor. It contains C++ template code for the Hello World example project you selected earlier.</p>
-	<br>
-	<p><strong>Note:</strong> You can specify a different editor, and add or modify existing code templates in <strong>Window &gt; Preferences</strong>.</p><p>In addition, the <strong>Outline</strong> view has also been populated
-with objects created from your code.</p> <p><a href="javascript:void(0)" onClick="newWin('../images/cdt_w_basic13.png')">Click here to see an illustration.</a></p>
-</li>
-<li>Optional: You can type additional code in this file, and then save the changes by clicking <span
- style="font-weight: bold;">File &gt; Save</span>, or pressing <strong>CTRL+S</strong>.
- 
- <p><br>Next, you will need to build your project before you can run it.</p><br></li>
-<li>Build your project by pressing <strong>CTRL+B</strong>, or select the project from the Project Explorer tab in the C++ Projects view and select <strong>File &gt; Build Project</strong>.</p>
-<p><br><strong>Note:</strong> If a build generates any errors or warnings, you can see those in the Problems view. If you encounter difficulty, see the topics <a href="../concepts/cdt_c_build_over.htm">Building C/C++ projects</a> and <a href="../concepts/cdt_c_before_you_begin.htm">Before you begin</a><br>.</p></li>
-<li>Read through the build messages in the <strong>Console</strong> view.
+	<li>From the  <strong>Project Explorer</strong> view, double-click the .cpp file  created for your project, for example, <span class="typewriter">HelloWorld.cpp</span>. You'll find it within the project  "<span class="typewriter">src</span>" folder.<br>
+    <br>
+    <p>This file opens in a default editor. It contains C++ template code for the Hello World example project you selected earlier. In addition, the <a href="../reference/cdt_u_outline_view.htm">Outline</a> view has also been populated
+        with objects created from your code.<br>
+        <br>
+        <img src="../images/cdt_w_basic13.png" width="731" height="333"><br>
+        <br>
+        <strong>NOTE:</strong> You can specify a different editor, and add or modify existing code templates in <strong>Window &gt; Preferences</strong>.<br>
+        <br>
+        <strong>OPTIONAL</strong>: You can type additional code in this file, and then save the changes by clicking <span
+ style="font-weight: bold;">File &gt; Save</span>, or pressing <strong>CTRL+S</strong>.<br>
+        <br>
+        Next, you will need to build your project before you can run it.<br>
+        <br>
+    </p>
+	</li>
+    <li>Build your project by pressing <strong>CTRL+B</strong>, or select the project in the <strong>Project Explorer</strong> view and select <strong>File &gt; Build Project</strong>.
+        </p>
+        <p><br>
+            <strong>NOTE:</strong> If a build generates any errors or warnings, you can see those in the <a href="../reference/cdt_u_problems_view.htm">Problems</a> view. If you encounter difficulty, see the topics <a href="../concepts/cdt_c_build_over.htm">Building C/C++ projects</a> and <a href="../concepts/cdt_c_before_you_begin.htm">Before you begin</a><br>
+            .</p>
+    </li>
+<li>Read through the build messages in the <a href="../reference/cdt_u_console_view.htm">Console</a> view.
 The project should build successfully.</p>
 <br>
+<br>
 <p>You will also see the <strong>Outline</strong> view has also been populated
 with objects created from your code. If you select an item from the <strong>Outline</strong> view, the
-corresponding text in the editor is highlighted.</p><br>
+corresponding text in the editor is highlighted.</p>
 </ol>  
 
-<h3>Step 3: Running the application</h3>
+<hr>
+<br>
+<h3>Step 3: <a name="cdt_running" id="cdt_running"></a>Running the application</h3>
 
 <p>To run your application:</p>
 <ol>
 	<li>Within the C/C++ Perspective, click <strong>Run &gt; Run Configurations...</strong>.<p><br></p></li>
 	<li>Select <strong>C/C++ Application</strong>.<p><br></p></li>
-    <li>Click <strong>New</strong>.<p><br></p></li>
+    <li>Click <strong>New</strong>.<br>
+    </li>
 
 	<p>A new Run Configuration is created. Its name and path to the executable are provided by the project ('Hello World' in our case). 
 
diff --git a/doc/org.eclipse.cdt.doc.user/help.css b/doc/org.eclipse.cdt.doc.user/help.css
index 55e14e7f8c9..5c2369858b4 100644
--- a/doc/org.eclipse.cdt.doc.user/help.css
+++ b/doc/org.eclipse.cdt.doc.user/help.css
@@ -1,56 +1,56 @@
-/* following font face declarations need to be removed for DBCS */
-
-
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000}
-pre				{ font-family: Courier, monospace}
-
-/* end font face declarations */
-
-/* following font size declarations should be OK for DBCS */
-body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 10pt; }
-pre				{ font-size: 10pt}
-
-/* end font size declarations */
-
-body	     { background: #FFFFFF}
-h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
-h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
-h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
-h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
-h5           { font size: 13.5pt; }
-p 	     { font-size: 10pt; }
-pre	     { margin-left: 6; font-size: 9pt }
-
-a:link { color: #006699 }
-a:visited { color: #996699 }
-a:hover  { color: #006699 }
-
-ul	     { margin-top: 0; margin-bottom: 10 }
-li	     { margin-top: 0; margin-bottom: 0 } 
-li p	     { margin-top: 0; margin-bottom: 0 } 
-ol	     { margin-top: 0; margin-bottom: 10 }
-dl	     { margin-top: 0; margin-bottom: 10 }
-dt	     { margin-top: 0; margin-bottom: 0; font-weight: bold }
-dd	     { margin-top: 0; margin-bottom: 0 }
-strong	     { font-weight: bold}
-em	     { font-style: italic}
-var	     { font-style: italic}
-div.revision { border-left-style: solid; border-left-width: thin; 
-				   border-left-color: #7B68EE; padding-left:5 }
-th	     { font-weight: bold }
-
-/* Mike Behm's addition to the style sheet */
-.userinput { font-family: monospace; }
-.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, 
-.notetitle  {
-     color: #000000;
-     font-family: helvetica, arial, sans-serif;
-     font-weight: bold;
-     }
-div.linux  {display:none;}
-.firsterm {font-style:italic;}
-
-.typewriter {font-family:monospace;}
-.bold {font-weight:600;}
-.linethrough {text-decoration: line-through;}
-.underline {text-decoration: underline;}
+/* following font face declarations need to be removed for DBCS */
+
+
+body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-family: Arial, sans-serif; color: #000000}
+pre				{ font-family: Courier, monospace}
+
+/* end font face declarations */
+
+/* following font size declarations should be OK for DBCS */
+body, h1, h2, h3, h4, p, table, td, caption, th, ul, ol, dl, li, dd, dt {font-size: 12pt; }
+pre				{ font-size: 12pt}
+
+/* end font size declarations */
+
+body	     { background: #FFFFFF}
+h1           { font-size: 18pt; margin-top: 5; margin-bottom: 1 }	
+h2           { font-size: 14pt; margin-top: 25; margin-bottom: 3 }
+h3           { font-size: 11pt; margin-top: 20; margin-bottom: 3 }
+h4           { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: italic }
+h5           { font size: 13.5pt; }
+p 	     { font-size: 12pt; }
+pre	     { margin-left: 6; font-size: 9pt }
+
+a:link { color: #006699 }
+a:visited { color: #996699 }
+a:hover  { color: #006699 }
+
+ul	     { margin-top: 0; margin-bottom: 10 }
+li	     { margin-top: 0; margin-bottom: 0 } 
+li p	     { margin-top: 0; margin-bottom: 0 } 
+ol	     { margin-top: 0; margin-bottom: 10 }
+dl	     { margin-top: 0; margin-bottom: 10 }
+dt	     { margin-top: 0; margin-bottom: 0; font-weight: bold }
+dd	     { margin-top: 0; margin-bottom: 0 }
+strong	     { font-weight: bold}
+em	     { font-style: italic}
+var	     { font-style: italic}
+div.revision { border-left-style: solid; border-left-width: thin; 
+				   border-left-color: #7B68EE; padding-left:5 }
+th	     { font-weight: bold }
+
+/* Mike Behm's addition to the style sheet */
+.userinput { font-family: monospace; }
+.guitab, .important, .guibutton, .selectblue, .guimenu, .guilabel, 
+.notetitle  {
+     color: #000000;
+     font-family: helvetica, arial, sans-serif;
+     font-weight: bold;
+     }
+div.linux  {display:none;}
+.firsterm {font-style:italic;}
+
+.typewriter {font-family:monospace;}
+.bold {font-weight:600;}
+.linethrough {text-decoration: line-through;}
+.underline {text-decoration: underline;}
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic02.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic02.png
index d03b6987a90..c19d0ba7535 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic02.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic02.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03.png
index 7936b502364..92a3dcef36d 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03a.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03a.png
index d8be9b753d1..4766fcca623 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03a.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic03a.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic04.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic04.png
index 46539684358..3657177b8cc 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic04.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic04.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic06a.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic06a.png
new file mode 100755
index 00000000000..05d86630deb
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic06a.png differ
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 9544c83ca3b..9a30f00aa1d 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_basic12.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic12.png
index 0dd8d6945ed..be5ee872eab 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic12.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic12.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic13.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic13.png
index 6ebc3a71846..81c9ddf3d72 100644
Binary files a/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic13.png and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_basic13.png differ
