diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm
new file mode 100644
index 00000000000..985a5dc5f5c
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm
@@ -0,0 +1,36 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h1>Before you begin</h1>
+<p>You must install and configure the following utilities:</p>
+<ul>
+ <li>Build (such as <tt>make</tt>).</li>
+ <li>Compile (such as gcc). For more information, see <a href="http://gcc.gnu.org">http://gcc.gnu.org</a>.</li>
+ <li>Debug (such as gdb). For more information, see <a href="http://sources.redhat.com/gdb/">http://sources.redhat.com/gdb/</a>.</li>
+</ul>
+
+<p><b>Tip:</b> Cygwin contains these utilities for a Windows environment.
+ For more information, see <a href="http://www.cygwin.com">http://www.cygwin.com</a>.
+</p>
+<p>To test if cygwin was installed correctly open a command prompt and type <tt>g++</tt> or <tt>make</tt>.</p>
+
+<p>The following error message means that no <tt>make</tt> is installed or your path is not configured correctly.</p>
+<pre>'g++' (or 'make') is not recognized as an internal or external command, operable program or batch file</pre>
+<p>To check your path at a command prompt and enter <tt>PATH</tt>. Make sure that the path to your build utility is defined (example <tt>PATH=c:\cygwin\bin</tt>).<p>
+
+
+<p align="left"> <img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
+ <br>
+ <a href="../concepts/cdt_o_home.htm">CDT Home</a><br>
+</p>
+<p><img src="../images/ng2003.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14">
+</p>
+</body>
+
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm
index cf6de6a5e77..7a646d81cdd 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm
@@ -13,8 +13,9 @@
<h1>Build</h1>
<p>This section describes the build views and terminology.</p>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_build_over.htm">Build views and terminology</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Extending the build capabilities of the CDT</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_build_over.htm">Build overview</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Manage Build Extensibility Document</a><br>
+
<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
</body>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm
index bb10cbad5a3..39a42d7793f 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_code_entry.htm
@@ -13,11 +13,11 @@
<h1>Coding aids</h1>
<p>This section provides information on code entry aids.</p>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_outlineview.htm">The structure of your source code</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_comments.htm">Using comments to document your code</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_content_assist.htm">Code completion and code templates</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_search.htm">C/C++ language-based search</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_declarations.htm">Declarations of elements</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_outlineview.htm">Outline View</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_comments.htm">Comments</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_content_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_c_search.htm">C/C++ search</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_declarations.htm">Open declarations</a><br>
<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
index 367532ae1fd..b2c2e886446 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
@@ -15,22 +15,22 @@
<p>Provides background information for CDT components, tasks and objectives.</p>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_over_cdt.htm">The C/C++ perspective</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_projects.htm">C/C++ projects</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_over_cdt.htm">CDT overview</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_projects.htm">CDT projects</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_projects.htm">CDT projects</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_proj_file_views.htm">Project file views</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_code_entry.htm">Code aids</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_outlineview.htm">The structure of your source code</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_comments.htm">Using comments to document your code</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_content_assist.htm">Code completion and code templates</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_search.htm">C/C++ language-based search</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_declarations.htm">Declarations of elements</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_build_conc.htm">Building your C/C++ projects</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_build_over.htm">Build views and terminology</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Extending the build capabilities of the CDT</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_concepts.htm">Debugging your C/C++ projects</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_over_dbg.htm">CDT debugger</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_dbg_info.htm">How debug information is displayed</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_outlineview.htm">Outline View</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_comments.htm">Comments</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_content_assist.htm">Content Assist</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_search.htm">C/C++ search</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_open_declarations.htm">Open declarations</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_build_conc.htm">Build</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_build_over.htm">Build overview</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Manage Build Extensibility Document</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_concepts.htm">Debug</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_over_dbg.htm">Debug overview</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_dbg_info.htm">Debug information</a><br>
<p><img src="../images/ng03_04.gif" ALT="IBM Corporation Statement" BORDER=0 width="324" height="14"></p>
</body>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm
index e772d5244fe..6664f4dfbc1 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_dbg_concepts.htm
@@ -14,8 +14,8 @@
<p>This section describes CDT debug concepts.</p>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_over_dbg.htm">CDT debugger</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_dbg_info.htm">How debug information is displayed</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_over_dbg.htm">Debug overview</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_dbg_info.htm">Debug information</a><br>
<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_home.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_home.htm
index bd8b42bfb2d..7343f2d7768 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_home.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_home.htm
@@ -15,12 +15,13 @@
<p>This guide provides instructions for using the C/C++ Development Toolkit (CDT) in the workbench.</p>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="../getting_started/cdt_o_tutorial.htm">Tutorial</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_concepts.htm">CDT background information</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="../tasks/cdt_o_tasks.htm">Step-by-step instructions to use the CDT</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="../reference/cdt_o_ref.htm">Information about CDT icons, views, and windows</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="../getting_started/cdt_o_tutorial.htm">Getting Started</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_concepts.htm">Concepts</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="../tasks/cdt_o_tasks.htm">Tasks</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="../reference/cdt_o_ref.htm">Reference</a><br>
<br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_whatsnew.htm">What's new for this release of the CDT</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_before_you_begin.htm">Before you begin</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_whatsnew.htm">What's new</a><br>
<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
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 8ab04d4d5f3..795284c014c 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
@@ -3,75 +3,34 @@
<head>
<meta http-equiv="Content-Language" content="en-us">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Tutorial</title>
+ <title>Tutorials</title>
<link rel="stylesheet" type="text/css" href="../help.css">
</head>
<body>
<h1>Tutorial</h1>
-<p>This tutorial guides you through the process of using the C/C++ Development Toolkit (CDT) to create a HelloWorld project on a Windows platform.</p>
-<h2>Before you begin</h2>
-<p>You must install and configure the following utilities:</p>
-<ul>
- <li>Build (such as <tt>make</tt>).</li>
- <li>Compile (such as gcc). For more information, see <a href="http://gcc.gnu.org">http://gcc.gnu.org</a>.</li>
- <li>Debug (such as gdb). For more information, see <a href="http://sources.redhat.com/gdb/">http://sources.redhat.com/gdb/</a>.</li>
-</ul>
-<p><b>Tip:</b> Cygwin contains these utilities for a Windows environment.
- For more information, see <a href="http://www.cygwin.com">http://www.cygwin.com</a>.
-</p>
-<p>To test if cygwin was installed correctly open a command prompt and type <tt>g++</tt> or <tt>make</tt>.</p>
+<p>These tutorials will guide you through the process of using the C/C++ Development Toolkit (CDT).</p>
+
+<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>
+<br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_newproj.htm">Creating your project</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_newcpp.htm">Creating your C++ file</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_newmake.htm">Creating your makefile</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_build.htm">Building your project</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_w_debug.htm">Debugging your project</a><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>
+
-<p>The following error message means that no <tt>make</tt> is installed or your path is not configured correctly.</p>
-<pre>'g++' (or 'make') is not recognized as an internal or external command, operable program or batch file</pre>
-<p>To check your path at a command prompt and enter <tt>PATH</tt>. Make sure that the path to your build utility is defined (example <tt>PATH=c:\cygwin\bin</tt>).<p>
-<table border="1" cellpadding="5" cellspacing="0" style="border-collapse: collapse" bordercolor="#111111" width="508">
- <tr>
- <th align="left" valign="bottom" width="279">To</th>
- <th align="left" width="206">See</th>
- </tr>
- <tr>
- <td align="left" width="279">Create, name, and specify the location of your
- project</td>
- <td align="left" width="206"><a href="cdt_w_newproj.htm">Creating your project</a></td>
- </tr>
- <tr>
- <td align="left" width="279">Create, name, and save your CPP file</td>
- <td align="left" width="206"><a href="cdt_w_newcpp.htm">Creating your C++
- file</a></td>
- </tr>
- <tr>
- <td align="left" width="279">Create, name, and save your gnu <tt>makefile</tt></td>
- <td align="left" width="206"><a href="cdt_w_newmake.htm">Creating your makefile</a></td>
- </tr>
- <tr>
- <td align="left" width="279">Build your project</td>
- <td align="left" width="206"><a href="cdt_w_build.htm">Building your project</a></td>
- </tr>
- <tr>
- <td align="left" width="279">Create a debug configuration and debug
- your project</td>
- <td align="left" width="206"><a href="cdt_w_debug.htm">Debugging your project</a></td>
- </tr>
- <tr>
- <td align="left" width="334">Recommended approaches for dealing with source
- files and files systems that were created outside of Eclipse</td>
- <td align="left" width="110"><a href="../getting_started/cdt_w_existing_code.htm">How to bring
- C/C++ source into Eclipse</a></td>
- </tr>
-</table>
-<p> </p>
-<p><a href="cdt_w_newmake.htm" style="text-decoration: none"> <img border="0" src="../images/ngnext.gif" width="16" height="16"></a>
- <b><a href="cdt_w_newproj.htm">Start Tutorial: Creating your project</a> </b>
-</p>
<p align="left"> <img border="0" src="../images/ngref.gif" ALT="Related reference" width="143" height="21">
<br>
<a href="../concepts/cdt_o_home.htm">CDT Home</a><br>
</p>
-<p><img src="../images/ng2003.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14">
-</p>
+<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
</body>
</html>
\ No newline at end of file
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 f1f1a8878b7..38c0df9f25a 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,83 +8,80 @@
<script language="JavaScript">
var first = 0;
-var last = 22;
+var last = 21;
var position = 0;
-var cdt_w_basicText= new Array(21)
-cdt_w_basicText[0]='cdt_w_basic00.htm';
-cdt_w_basicText[1]='cdt_w_basic01.htm';
-cdt_w_basicText[2]='cdt_w_basic02.htm';
-cdt_w_basicText[3]='cdt_w_basic03.htm';
-cdt_w_basicText[4]='cdt_w_basic04.htm';
-cdt_w_basicText[5]='cdt_w_basic05.htm';
-cdt_w_basicText[6]='cdt_w_basic06.htm';
-cdt_w_basicText[7]='cdt_w_basic07.htm';
-cdt_w_basicText[8]='cdt_w_basic08.htm';
-cdt_w_basicText[9]='cdt_w_basic09.htm';
-cdt_w_basicText[10]='cdt_w_basic10.htm';
-cdt_w_basicText[11]='cdt_w_basic11.htm';
-cdt_w_basicText[12]='cdt_w_basic12.htm';
-cdt_w_basicText[13]='cdt_w_basic13.htm';
-cdt_w_basicText[14]='cdt_w_basic14.htm';
-cdt_w_basicText[15]='cdt_w_basic15.htm';
-cdt_w_basicText[16]='cdt_w_basic16.htm';
-cdt_w_basicText[17]='cdt_w_basic17.htm';
-cdt_w_basicText[18]='cdt_w_basic18.htm';
-cdt_w_basicText[19]='cdt_w_basic19.htm';
-cdt_w_basicText[20]='cdt_w_basic20.htm';
-cdt_w_basicText[21]='cdt_w_basic21.htm';
-cdt_w_basicText[22]='cdt_w_basic22.htm';
+var cdt_w_basicText= new Array(22)
+cdt_w_basicText[0]='cdt_w_basic01.htm';
+cdt_w_basicText[1]='cdt_w_basic02.htm';
+cdt_w_basicText[2]='cdt_w_basic03.htm';
+cdt_w_basicText[3]='cdt_w_basic04.htm';
+cdt_w_basicText[4]='cdt_w_basic05.htm';
+cdt_w_basicText[5]='cdt_w_basic06.htm';
+cdt_w_basicText[6]='cdt_w_basic07.htm';
+cdt_w_basicText[7]='cdt_w_basic08.htm';
+cdt_w_basicText[8]='cdt_w_basic09.htm';
+cdt_w_basicText[9]='cdt_w_basic10.htm';
+cdt_w_basicText[10]='cdt_w_basic11.htm';
+cdt_w_basicText[11]='cdt_w_basic12.htm';
+cdt_w_basicText[12]='cdt_w_basic13.htm';
+cdt_w_basicText[13]='cdt_w_basic14.htm';
+cdt_w_basicText[14]='cdt_w_basic15.htm';
+cdt_w_basicText[15]='cdt_w_basic16.htm';
+cdt_w_basicText[16]='cdt_w_basic17.htm';
+cdt_w_basicText[17]='cdt_w_basic18.htm';
+cdt_w_basicText[18]='cdt_w_basic19.htm';
+cdt_w_basicText[19]='cdt_w_basic20.htm';
+cdt_w_basicText[20]='cdt_w_basic21.htm';
+cdt_w_basicText[21]='cdt_w_basic22.htm';
-var cdt_w_basicPic= new Array(21)
-cdt_w_basicPic[0]='../images/splash.png';
-cdt_w_basicPic[1]='../images/cdt_w_basic01.png';
-cdt_w_basicPic[2]='../images/cdt_w_basic02.png';
-cdt_w_basicPic[3]='../images/cdt_w_basic03.png';
-cdt_w_basicPic[4]='../images/cdt_w_basic04.png';
-cdt_w_basicPic[5]='../images/cdt_w_basic05.png';
-cdt_w_basicPic[6]='../images/cdt_w_basic06.png';
-cdt_w_basicPic[7]='../images/cdt_w_basic07.png';
-cdt_w_basicPic[8]='../images/cdt_w_basic08.png';
-cdt_w_basicPic[9]='../images/cdt_w_basic09.png';
-cdt_w_basicPic[10]='../images/cdt_w_basic10.png';
-cdt_w_basicPic[11]='../images/cdt_w_basic11.png';
-cdt_w_basicPic[12]='../images/cdt_w_basic12.png';
-cdt_w_basicPic[13]='../images/cdt_w_basic13.png';
-cdt_w_basicPic[14]='../images/cdt_w_basic14.gif';
-cdt_w_basicPic[15]='../images/cdt_w_basic15.png';
-cdt_w_basicPic[16]='../images/cdt_w_basic16.png';
-cdt_w_basicPic[17]='../images/cdt_w_basic17.png';
-cdt_w_basicPic[18]='../images/cdt_w_basic18.png';
-cdt_w_basicPic[19]='../images/cdt_w_basic19.png';
-cdt_w_basicPic[20]='../images/cdt_w_basic20.png';
-cdt_w_basicPic[21]='../images/cdt_w_basic21.png';
-cdt_w_basicPic[22]='../images/cdt_w_basic22.png';
+var cdt_w_basicPic= new Array(22)
+cdt_w_basicPic[0]='../images/cdt_w_basic01.png';
+cdt_w_basicPic[1]='../images/cdt_w_basic02.png';
+cdt_w_basicPic[2]='../images/cdt_w_basic03.png';
+cdt_w_basicPic[3]='../images/cdt_w_basic04.png';
+cdt_w_basicPic[4]='../images/cdt_w_basic05.png';
+cdt_w_basicPic[5]='../images/cdt_w_basic06.png';
+cdt_w_basicPic[6]='../images/cdt_w_basic07.png';
+cdt_w_basicPic[7]='../images/cdt_w_basic08.png';
+cdt_w_basicPic[8]='../images/cdt_w_basic09.png';
+cdt_w_basicPic[9]='../images/cdt_w_basic10.png';
+cdt_w_basicPic[10]='../images/cdt_w_basic11.png';
+cdt_w_basicPic[11]='../images/cdt_w_basic12.png';
+cdt_w_basicPic[12]='../images/cdt_w_basic13.png';
+cdt_w_basicPic[13]='../images/cdt_w_basic14.gif';
+cdt_w_basicPic[14]='../images/cdt_w_basic15.png';
+cdt_w_basicPic[15]='../images/cdt_w_basic16.png';
+cdt_w_basicPic[16]='../images/cdt_w_basic17.png';
+cdt_w_basicPic[17]='../images/cdt_w_basic18.png';
+cdt_w_basicPic[18]='../images/cdt_w_basic19.png';
+cdt_w_basicPic[19]='../images/cdt_w_basic20.png';
+cdt_w_basicPic[20]='../images/cdt_w_basic21.png';
+cdt_w_basicPic[21]='../images/cdt_w_basic22.png';
var screenText= new Array(21)
-screenText[0]='Eclipse Logo';
-screenText[1]='Eclipse Workbench';
-screenText[2]='Opening the C/C++ Perspective';
-screenText[3]='The C++ Perspective';
-screenText[4]='Creating a New Project';
-screenText[5]='New Project Wizard';
-screenText[6]='New Managed Make C++ Project';
-screenText[7]='Select a Target';
-screenText[8]='Error Parser Configuration';
-screenText[9]='New C++ Project in the Workbench';
-screenText[10]='Create a New File';
-screenText[11]='New File Wizard';
-screenText[12]='New File in the Workbench';
-screenText[13]='Entering Code in the New .cpp File';
-screenText[14]='Stepping Through the Code in Outline View';
-screenText[15]='Save the File';
-screenText[16]='Displaying New Executables in the Projects View';
-screenText[17]='Selecting Run from the Menu';
-screenText[18]='Run Wizard';
-screenText[19]='Selecting the Program to Run';
-screenText[20]='Run Configuration';
-screenText[21]='Console View with Program Running';
-screenText[22]='Console View with Program Terminated';
+screenText[0]='Eclipse Workbench';
+screenText[1]='Opening the C/C++ Perspective';
+screenText[2]='The C++ Perspective';
+screenText[3]='Creating a New Project';
+screenText[4]='New Project Wizard';
+screenText[5]='New Managed Make C++ Project';
+screenText[6]='Select a Target';
+screenText[7]='Error Parser Configuration';
+screenText[8]='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';
function nav_a() {
@@ -148,9 +145,9 @@ function goBack() {
</head>
<body>
-<h2>C/C++ Development Toolkit (CDT) Tutorial</h2>
+<h2>C/C++ Development Toolkit (CDT) Managed Make Tutorial</h2>
<center>
-<IFRAME name=textFrame SRC="cdt_w_basic00.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=150 frameborder=0 SCROLLING=auto></IFRAME>
<table width="75%" border="0" cellspacing="0" summary="">
<tr>
<td><img src="../images/trans.gif" align="left" width="16" height="16" onClick="goBack();" title="" name="back"></td>
@@ -158,7 +155,7 @@ function goBack() {
<td><img src="../images/next.gif" align="right" width="16" height="16" onClick="goNext();" title="Next" name="next" ></td>
</tr>
</table>
-<p><img src="../images/splash.png" align="center" width="800" height="600" alt="Eclipse Logo" name="screen" ></p>
+<p><img src="../images/cdt_w_basic01.png" align="center" width="800" height="600" alt="Eclipse Logo" name="screen" ></p>
</center>
<img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14">
</body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic01.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic01.htm
index 93a4a8d7410..8a0635d727b 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic01.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic01.htm
@@ -13,10 +13,9 @@ function newWin(url) {
</head>
<body>
<h3>Start Eclipse</h3>
-
-<p>The image below shows the standard Workbench. To start, open the C/C++ perspective.</p>
-
-<p>If you have not already installed the C/C++ perspective, you can find the procedures <a href="javascript:void(0)" onClick="newWin('cdt_w_install_cdt.htm')">here</a>.</p>
+<p>We will now walk though the process of creating a simple Managed 'Hello World' application using the CDT.</p>
+<p>The image below shows the standard Workbench. To start, open the C/C++ perspective.
+If you have not already installed the C/C++ perspective, you can find the procedures <a href="javascript:void(0)" onClick="newWin('cdt_w_install_cdt.htm')">here</a>.</p>
</body>
</html>
\ No newline at end of file
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 9253a83ca23..969dccb8120 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
@@ -9,9 +9,9 @@
<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 Edit View.</p>
+<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.
</body>
-</html>
+</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 8fc4e881bc4..baef3a40c6b 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
@@ -12,4 +12,4 @@
<p>You can now create a C/ C++ project by clicking <b>File > New > Project</b>.</p>
</body>
-</html>
+</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 8988092c777..d69c0736ca7 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
@@ -13,4 +13,4 @@
A Standard Make C/C++ project requires you to provide a makefile, a Managed Make project will create one for you.</p>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic06.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic06.htm
index e6d5a09c044..54b4f9bad60 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic06.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic06.htm
@@ -13,4 +13,4 @@ checkbox and entering the new path in the <b>Location</b> text box.</p>
<p>Click <b>Next</b>.</p>
</body>
-</html>
+</html>
\ No newline at end of file
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 bfeb6e8a54f..229c9c03e5f 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
@@ -12,4 +12,4 @@
<p>Click <b>Next</b>.</p>
</body>
-</html>
+</html>
\ No newline at end of file
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 c2acbcda313..ba990acf092 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
@@ -13,4 +13,4 @@ You can also change the order in which Error Parsers are called.</p>
<p>Click <b>Finish</b> to close the dialog box.</p>
</body>
-</html>
+</html>
\ No newline at end of file
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 33bbf23c4a8..29cdd622a73 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
@@ -12,4 +12,4 @@
<p>You should now see the new project in the C/C++ Projects view.</p>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic10.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic10.htm
index c98b3f0d1d6..f49e2fdbd95 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic10.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic10.htm
@@ -12,4 +12,4 @@
<p>Create a new cpp file (such as main.cpp) by right clicking your project and selecting <b>New > File</b>.</p>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic11.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic11.htm
index 59fc32100e5..ed6219c9538 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic11.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic11.htm
@@ -14,4 +14,4 @@
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic12.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic12.htm
index f78d2b9a95c..8135f469b82 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic12.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic12.htm
@@ -15,4 +15,4 @@ you may also see a few other objects such as <b>Debug</b> depending on your Make
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic14.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic14.htm
index 339778173f0..dd206767725 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic14.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic14.htm
@@ -13,4 +13,4 @@
</body>
-</html>
+</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 e3d5580ba4f..f0d1e21ca12 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
@@ -13,4 +13,4 @@
<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>
+</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 406a6b69cdf..b6d0f5ec86f 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
@@ -14,4 +14,4 @@ If you selected Debug options in your Makefile (as are default in a Managed Make
</body>
-</html>
+</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 5e0f3c066ca..886c6cce8a4 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
@@ -13,4 +13,4 @@
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic18.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic18.htm
index 5c6d9ab61fc..b4e3f8bedd5 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic18.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic18.htm
@@ -15,4 +15,4 @@ This will create your Run Configuration.</p>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic19.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic19.htm
index e17a2f63b48..f14cabf20a7 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic19.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic19.htm
@@ -13,4 +13,4 @@
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic20.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic20.htm
index 4a6afab06ca..29bef6a1dfd 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic20.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic20.htm
@@ -15,4 +15,4 @@
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic21.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic21.htm
index 4ce0a618e3d..7a4ff8e8eba 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic21.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic21.htm
@@ -14,4 +14,4 @@
</body>
-</html>
+</html>
\ No newline at end of file
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 8d6457d38cb..d986d5570ce 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
@@ -12,4 +12,4 @@
<p>The title bar in the <b>Console</b> view will show you when the program has terminated.</p>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm
index 36c88316578..16082ed7453 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_build.htm
@@ -1,13 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html lang="en">
-
<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>Building your project</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Building your project</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
</head>
<body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm
index 6adce8ff01a..0a2ff0fd1d9 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_debug.htm
@@ -2,12 +2,10 @@
<html lang="en">
<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>Debugging your project</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Debugging your project</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
</head>
<body>
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 01618ef460a..50fcb90013a 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
@@ -1,13 +1,10 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
<html lang="en">
-
<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>How to bring C/C++ source files into Eclipse</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>How to bring C/C++ source files into Eclipse</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
</head>
<body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm
index ec9251498b3..dc6e0c751b1 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newcpp.htm
@@ -2,12 +2,10 @@
<html lang="en">
<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>Creating your C++ file</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Creating your C++ file</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
</head>
<body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm
index e348a54675b..6e4c7fff1b9 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newmake.htm
@@ -2,12 +2,10 @@
<html lang="en">
<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>Creating your makefile</title>
-<link rel="stylesheet" type="text/css" href="../help.css">
+ <meta http-equiv="Content-Language" content="en-us">
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <title>Creating your makefile</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
</head>
<body>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm
index bc648ebe982..0138e03b488 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_newproj.htm
@@ -1,14 +1,11 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html lang="en">
-
<html lang="en">
<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>Creating your project</title>
-<link href="../help.css" type="text/css" rel="stylesheet"></head>
+ <meta http-equiv="content-language" content="en-us">
+ <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+ <title>Creating your project</title>
+ <link href="../help.css" type="text/css" rel="stylesheet">
+</head>
<body> <h1>Creating your project</h1> <p>You need to create a project to
contain your source code and related files. A project has an associated builder
that can incrementally compile source files as they are changed.</p> <p>
@@ -57,6 +54,9 @@ CDT projects</a><br> <a href="../concepts/cdt_c_proj_file_views.htm">Project fil
border="0"> <br> <a href="../tasks/cdt_o_proj_prop.htm">Defining project properties
</a><br> <a href="../tasks/cdt_o_proj_files.htm">Working with C/C++ project files</a></p> <p><img
src="../images/ngref.gif" alt="Related reference" height="21" width="143" border="0"> <br> <a
-href="../reference/cdt_o_proj_prop_pages.htm">C/C++ Projects view</a></p> <p><img src="../images/ngtasks.gif"
-alt="IBM Copyright Statement" height="14" width="324" border="0"></p></body>
-</html>
+href="../reference/cdt_o_proj_prop_pages.htm">C/C++ Projects view</a></p>
+
+<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
+
+</body>
+</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
new file mode 100644
index 00000000000..e284e55979a
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard.htm
@@ -0,0 +1,182 @@
+<!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>Hello World cdt_w_standardorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+
+<script language="JavaScript">
+var first = 0;
+var last = 27;
+var position = 0;
+
+var cdt_w_standardText= new Array(28)
+cdt_w_standardText[0]='cdt_w_standard01.htm';
+cdt_w_standardText[1]='cdt_w_standard02.htm';
+cdt_w_standardText[2]='cdt_w_standard03.htm';
+cdt_w_standardText[3]='cdt_w_standard04.htm';
+cdt_w_standardText[4]='cdt_w_standard05.htm';
+cdt_w_standardText[5]='cdt_w_standard06.htm';
+cdt_w_standardText[6]='cdt_w_standard07.htm';
+cdt_w_standardText[7]='cdt_w_standard08.htm';
+cdt_w_standardText[8]='cdt_w_standard09.htm';
+cdt_w_standardText[9]='cdt_w_standard10.htm';
+cdt_w_standardText[10]='cdt_w_standard11.htm';
+cdt_w_standardText[11]='cdt_w_standard12.htm';
+cdt_w_standardText[12]='cdt_w_standard13.htm';
+cdt_w_standardText[13]='cdt_w_standard14.htm';
+cdt_w_standardText[14]='cdt_w_standard15.htm';
+cdt_w_standardText[15]='cdt_w_standard16.htm';
+cdt_w_standardText[16]='cdt_w_standard17.htm';
+cdt_w_standardText[17]='cdt_w_standard18.htm';
+cdt_w_standardText[18]='cdt_w_standard19.htm';
+cdt_w_standardText[19]='cdt_w_standard20.htm';
+cdt_w_standardText[20]='cdt_w_standard21.htm';
+cdt_w_standardText[21]='cdt_w_standard22.htm';
+cdt_w_standardText[22]='cdt_w_standard23.htm';
+cdt_w_standardText[23]='cdt_w_standard24.htm';
+cdt_w_standardText[24]='cdt_w_standard25.htm';
+cdt_w_standardText[25]='cdt_w_standard26.htm';
+cdt_w_standardText[26]='cdt_w_standard27.htm';
+cdt_w_standardText[27]='cdt_w_standard28.htm';
+
+
+var cdt_w_standardPic= new Array(28)
+cdt_w_standardPic[0]='../images/cdt_w_standard01.png';
+cdt_w_standardPic[1]='../images/cdt_w_standard02.png';
+cdt_w_standardPic[2]='../images/cdt_w_standard03.png';
+cdt_w_standardPic[3]='../images/cdt_w_standard04.png';
+cdt_w_standardPic[4]='../images/cdt_w_standard05.png';
+cdt_w_standardPic[5]='../images/cdt_w_standard06.png';
+cdt_w_standardPic[6]='../images/cdt_w_standard07.png';
+cdt_w_standardPic[7]='../images/cdt_w_standard08.png';
+cdt_w_standardPic[8]='../images/cdt_w_standard09.png';
+cdt_w_standardPic[9]='../images/cdt_w_standard10.png';
+cdt_w_standardPic[10]='../images/cdt_w_standard11.png';
+cdt_w_standardPic[11]='../images/cdt_w_standard12.png';
+cdt_w_standardPic[12]='../images/cdt_w_standard13.png';
+cdt_w_standardPic[13]='../images/cdt_w_standard14.png';
+cdt_w_standardPic[14]='../images/cdt_w_standard15.png';
+cdt_w_standardPic[15]='../images/cdt_w_standard16.png';
+cdt_w_standardPic[16]='../images/cdt_w_standard17.png';
+cdt_w_standardPic[17]='../images/cdt_w_standard18.png';
+cdt_w_standardPic[18]='../images/cdt_w_standard19.png';
+cdt_w_standardPic[19]='../images/cdt_w_standard20.png';
+cdt_w_standardPic[20]='../images/cdt_w_standard21.png';
+cdt_w_standardPic[21]='../images/cdt_w_standard22.png';
+cdt_w_standardPic[22]='../images/cdt_w_standard23.png';
+cdt_w_standardPic[23]='../images/cdt_w_standard24.png';
+cdt_w_standardPic[24]='../images/cdt_w_standard25.png';
+cdt_w_standardPic[25]='../images/cdt_w_standard26.png';
+cdt_w_standardPic[26]='../images/cdt_w_standard27.png';
+cdt_w_standardPic[27]='../images/cdt_w_standard28.png';
+
+var screenText= new Array(28)
+screenText[0]='Eclipse Workbench';
+screenText[1]='Opening the C/C++ Perspective';
+screenText[2]='The C++ Perspective';
+screenText[3]='Creating a New Project';
+screenText[4]='New Project Wizard';
+screenText[5]='New Managed Make C++ Project';
+screenText[6]='Select a Target';
+screenText[7]='Error Parser Configuration';
+screenText[8]='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[22]='Console View with Program Terminated';
+screenText[23]='Console View with Program Terminated';
+screenText[24]='Console View with Program Terminated';
+screenText[25]='Console View with Program Terminated';
+screenText[26]='Console View with Program Terminated';
+screenText[27]='Console View with Program Terminated';
+
+
+
+function nav_a() {
+ document.back.src='../images/back.gif';
+ document.back.title='Back';
+
+ document.home.src='../images/home.gif';
+ document.home.title='Start Over';
+
+ document.next.src='../images/next.gif';
+ document.next.title='Next';
+ };
+
+function nav_b() {
+ document.back.src='../images/trans.gif';
+ document.back.title='';
+
+ document.home.src='../images/trans.gif';
+ document.home.title='';
+
+ document.next.src='../images/next.gif';
+ document.next.title='Next';
+ };
+
+function nav_e() {
+ document.back.src='../images/back.gif';
+ document.back.title='Back';
+
+ document.home.src='../images/home.gif';
+ document.home.title='Start Over';
+
+ document.next.src='../images/trans.gif';
+ document.next.title='';
+ };
+
+function show() {
+ textFrame.location.href = cdt_w_standardText[position];
+ document.screen.src = cdt_w_standardPic[position];
+ document.screen.alt = screenText[position];
+}
+
+function reset() {
+ position = first;
+ show();
+ nav_b();
+}
+
+function goNext() {
+ if ( position == first ) { nav_a(); };
+ if ( position < last ) { position++; show(); }
+ if ( position == last ) { nav_e(); }
+}
+
+function goBack() {
+ if ( position == last ) { nav_a(); };
+ if ( position > first ) { position--; show()};
+ if ( position == first ) { nav_b(); };
+}
+
+</script>
+
+</head>
+<body>
+<h2>C/C++ Development Toolkit (CDT) Standard Make Tutorial</h2>
+<center>
+<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="75%" 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>
+ </tr>
+</table>
+<p><img src="../images/cdt_w_standard01.png" align="center" width="800" height="600" alt="Eclipse Logo" name="screen" ></p>
+</center>
+<img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14">
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard01.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard01.htm
new file mode 100644
index 00000000000..fd220f7431e
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard01.htm
@@ -0,0 +1,22 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+<script language="JavaScript">
+function newWin(url) {
+ window.open(url, 'install_cdt', 'width=750, height=300, menubar=no, toolbar=no, status=no, resizable=yes, location=no, scrollbars=yes');
+}
+</script>
+</head>
+<body>
+<h3>Start Eclipse</h3>
+<p>We will now walk though the process of creating a simple Standard Make 'Hello World' application using the CDT.</p>
+
+<p>The image below shows the standard Workbench. To start, open the C/C++ perspective.
+If you have not already installed the C/C++ perspective, you can find the procedures <a href="javascript:void(0)" onClick="newWin('cdt_w_install_cdt.htm')">here</a>.</p>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard02.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard02.htm
new file mode 100644
index 00000000000..f863cc10031
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard02.htm
@@ -0,0 +1,17 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Open the C/C++ Perspective</h3>
+
+<p>Click <b>Window > Open Perspective > C/C++</b>.</p>
+<p><i>Note: If the C/C++ Perspective is not listed, select <b>Other...</b> and select it from the <b>Select Perspective</b> dialog box.</i></p>
+
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..a007ccddbc4
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard03.htm
@@ -0,0 +1,17 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</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.
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..8fc4e881bc4
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Create a project</h3>
+
+<p>You can now create a C/ C++ project by clicking <b>File > New > Project</b>.</p>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard05.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard05.htm
new file mode 100644
index 00000000000..8988092c777
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard05.htm
@@ -0,0 +1,16 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<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.
+A Standard Make C/C++ project requires you to provide a makefile, a Managed Make project will create one for you.</p>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard06.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard06.htm
new file mode 100644
index 00000000000..e6d5a09c044
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard06.htm
@@ -0,0 +1,16 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>New Project</h3>
+<p>Enter a name for the project. You can also enter a new path for your project by deselecting the <b>Use Default Location</b>
+checkbox and entering the new path in the <b>Location</b> text box.</p>
+<p>Click <b>Next</b>.</p>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..99c4324a2bf
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm
@@ -0,0 +1,17 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Make Builder Settings</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>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..e9849ef0b8e
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <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>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..24aaecbebc0
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm
@@ -0,0 +1,17 @@
+<!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>Tutorial</title>
+ <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>
+
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..3a2a126deb6
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm
@@ -0,0 +1,19 @@
+<!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>Tutorial</title>
+ <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>
+
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..36c259dc9fb
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard11.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <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>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..5fe34f2bdf0
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard12.htm
@@ -0,0 +1,16 @@
+<!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>Tutorial</title>
+ <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>
+
+</body>
+
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard13.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard13.htm
new file mode 100644
index 00000000000..c98b3f0d1d6
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard13.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Create a file</h3>
+
+<p>Create a new cpp file (such as main.cpp) by right clicking your project and selecting <b>New > File</b>.</p>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..ebf9b43fa15
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm
@@ -0,0 +1,16 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Create a file</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>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard15.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard15.htm
new file mode 100644
index 00000000000..719a81a642e
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard15.htm
@@ -0,0 +1,16 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<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>
+
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..4b018efe366
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Create a makefile</h3>
+
+<p>Create a new makefile by right clicking your project and selecting <b>New > File</b>.</p>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..9043438910d
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm
@@ -0,0 +1,16 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Create a makefile</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>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..d1d0b138ad4
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard18.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>New Makefile</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>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..7ef3f52c331
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard19.htm
@@ -0,0 +1,20 @@
+<!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>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>
+
+<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>
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
new file mode 100644
index 00000000000..b8b5e62f02b
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard20.htm
@@ -0,0 +1,22 @@
+<!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>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>
+
+<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>
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
new file mode 100644
index 00000000000..8eb9db7ccdc
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard21.htm
@@ -0,0 +1,17 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Save the files</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>
+
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..e06e9676998
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard22.htm
@@ -0,0 +1,20 @@
+<!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>Tutorial</title>
+ <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>
+
+
+
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard23.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard23.htm
new file mode 100644
index 00000000000..0714494ffde
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard23.htm
@@ -0,0 +1,18 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Run Configuration</h3>
+
+<p>You should now see the <b>Run Configurations</b> dialog box, navigate to the project in the <b>Configurations:</b> view, and then click <b>New</b>.
+This will create your Run Configuration.</p>
+
+
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard24.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard24.htm
new file mode 100644
index 00000000000..14b90e348b5
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard24.htm
@@ -0,0 +1,14 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Run Configuration</h3>
+<p>Select the new Run Configuration in the <b>Configurations:</b> view and click the <b>Main</b> tab and then the <b>Search</b> button.</p>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..4751509fa18
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard25.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <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>
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..86854edd32e
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard26.htm
@@ -0,0 +1,17 @@
+<!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>Tutorial</title>
+ <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>
+
+
+</body>
+</html>
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
new file mode 100644
index 00000000000..24853621a69
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard27.htm
@@ -0,0 +1,16 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<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>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard28.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard28.htm
new file mode 100644
index 00000000000..8d6457d38cb
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard28.htm
@@ -0,0 +1,15 @@
+<!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>Tutorial</title>
+ <link rel="stylesheet" type="text/css" href="../help.css">
+</head>
+<body>
+<h3>Run complete</h3>
+
+<p>The title bar in the <b>Console</b> view will show you when the program has terminated.</p>
+
+</body>
+</html>
diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm b/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm
new file mode 100644
index 00000000000..e0d15c24759
--- /dev/null
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm
@@ -0,0 +1,27 @@
+<!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++ Makefile example</title>
+</head>
+<body bgcolor="#ffffcc">
+<font color="#0066ff">Copy the script below and paste it into the <b>makefile</b> file in the Editor View:</font>
+
+<pre>
+makefile:
+ all: hello
+
+clean:
+ -rm main.o hello.exe hello
+
+hello: main.o
+ g++ -g -o hello main.o
+
+main.o: main.cpp
+ g++ -c -g main.cpp
+
+</pre>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/help.css b/doc/org.eclipse.cdt.doc.user/help.css
index 84aada25da7..8f09f90e7b3 100644
--- a/doc/org.eclipse.cdt.doc.user/help.css
+++ b/doc/org.eclipse.cdt.doc.user/help.css
@@ -20,7 +20,6 @@ h4 { font-size: 10pt; margin-top: 20; margin-bottom: 3; font-style: it
p { font-size: 10pt; }
pre { margin-left: 6; font-size: 9pt }
-
a:link { color: #006699 }
a:visited { color: #996699 }
a:hover { color: #006699 }
@@ -50,4 +49,3 @@ th { font-weight: bold }
div.linux {display:none;}
.firsterm {font-style:italic;}
-
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard01.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard01.png
new file mode 100644
index 00000000000..24c306f0684
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard01.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard02.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard02.png
new file mode 100644
index 00000000000..939fa1a00cc
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard02.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard03.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard03.png
new file mode 100644
index 00000000000..9c0f61ab32b
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard03.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard04.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard04.png
new file mode 100644
index 00000000000..d978d7a277a
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard04.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard05.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard05.png
new file mode 100644
index 00000000000..e6e6bbf5a80
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard05.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard06.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard06.png
new file mode 100644
index 00000000000..d887d0e9988
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard06.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard07.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard07.png
new file mode 100644
index 00000000000..9b07a96874b
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard07.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard08.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard08.png
new file mode 100644
index 00000000000..5ac41d6ae57
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard08.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard09.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard09.png
new file mode 100644
index 00000000000..1c2195d5252
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard09.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard10.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard10.png
new file mode 100644
index 00000000000..a62325c6fbb
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard10.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard11.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard11.png
new file mode 100644
index 00000000000..e4a0629c98b
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard11.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard12.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard12.png
new file mode 100644
index 00000000000..bcc00e69a25
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard12.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard13.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard13.png
new file mode 100644
index 00000000000..a3d77d44520
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard13.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard14.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard14.png
new file mode 100644
index 00000000000..7964ee6d71f
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard14.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard15.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard15.png
new file mode 100644
index 00000000000..4f3712abf55
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard15.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard16.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard16.png
new file mode 100644
index 00000000000..44e1c0441e6
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard16.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard17.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard17.png
new file mode 100644
index 00000000000..2a865036412
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard17.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard18.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard18.png
new file mode 100644
index 00000000000..9b786e78dd6
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard18.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard19.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard19.png
new file mode 100644
index 00000000000..28027269b5d
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard19.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard20.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard20.png
new file mode 100644
index 00000000000..796e77c7296
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard20.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard21.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard21.png
new file mode 100644
index 00000000000..d53186db0a0
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard21.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard22.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard22.png
new file mode 100644
index 00000000000..96ec99b0471
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard22.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard23.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard23.png
new file mode 100644
index 00000000000..1b8a64fc940
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard23.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard24.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard24.png
new file mode 100644
index 00000000000..44933c87a63
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard24.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard25.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard25.png
new file mode 100644
index 00000000000..f2b5b255217
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard25.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard26.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard26.png
new file mode 100644
index 00000000000..c8ed72eea2c
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard26.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard27.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard27.png
new file mode 100644
index 00000000000..ba1e2abf4bd
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard27.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard28.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard28.png
new file mode 100644
index 00000000000..9ffe1e33ed9
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_standard28.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_dbg_view.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_dbg_view.htm
index a2f936ed94a..09d5a8e3adf 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_dbg_view.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_dbg_view.htm
@@ -14,14 +14,13 @@
<p>This section describes debug views.</p>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">View information about registers</a><br>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Inspect and change process memory</a><br>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Change the appearance of the memory view</a><br>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_shared_lib_view.htm">View information about shared libraries</a><br>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">View signals defined for a given debug target</a><br>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">View debug information</a><br>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_pref.htm">Set C/C++ debug preferences</a><br>
- <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_icons.htm">Icons</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">Registers view</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Memory view</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Memory view preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_shared_lib_view.htm">Shared libraries view</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">Signals view</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">Debug view</a><br>
+ <img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_pref.htm">Debug preferences</a><br>
<p><img src="../images/ng03_04.gif" ALT="IBM Copyright Statement" BORDER=0 width="324" height="14"></p>
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
index 62951283122..05b8160916e 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_o_ref.htm
@@ -15,18 +15,18 @@
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_views.htm">Views</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_outlineview.htm">Outline View</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_view.htm">Debug View</a><br>
- <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">View information about registers</a><br>
- <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Inspect and change process memory</a><br>
- <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Change the appearance of the memory view</a><br>
- <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_shared_lib_view.htm">View information about shared libraries</a><br>
- <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">View signals defined for a given debug target</a><br>
- <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">View debug information</a><br>
- <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_pref.htm">Set C/C++ debug preferences</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_icons.htm">Icons</a><br>
+ <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_registersview.htm">Registers view</a><br>
+ <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_memoryview.htm">Memory view</a><br>
+ <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_mem_view_pref.htm">Memory view preferences</a><br>
+ <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_shared_lib_view.htm">Shared libraries view</a><br>
+ <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_signals_view.htm">Signals view</a><br>
+ <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_view.htm">Debug view</a><br>
+ <img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_dbg_pref.htm">Debug preferences</a><br>
+<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_icons.htm">CDT Icons</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_pref.htm">C/C++ Preferences</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_pref.htm">C/C++ preferences</a><br>
<img src="../images/trans.gif" border="0" width="50" 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="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_ceditor_pref.htm">C/C++ Editor</a><br>
+<img src="../images/trans.gif" border="0" width="50" 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="75" 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="75" 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="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_c_editor_color.htm">Colors</a><br>
@@ -37,7 +37,7 @@
<img src="../images/trans.gif" border="0" width="75" height="1" alt="">GDB MI<br>
<img src="../images/trans.gif" border="0" width="75" height="1" alt="">Source Code Locations<br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_u_make_targets_pref.htm">Make Targets</a><br>
-<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_proj_prop_pages.htm">New Make Projects</a><br>
+<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_o_proj_prop_pages.htm">New Make Projects properties</a><br>
<img src="../images/trans.gif" border="0" width="75" 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="75" 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="75" height="1" alt=""><a style="text-decoration:none" href="cdt_u_newproj_parser_binary.htm">Binary Parser</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
index dd512eb20ae..aa443454dcc 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasks.htm
@@ -33,11 +33,11 @@
<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>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_build_set.htm">Configure how the CDT handles make errors, change the default build command and specify 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_proj_build_set.htm">Configure Project Builds</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_error_parser.htm">Control which build errors are displayed</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_parser.htm">Select a binary parser</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_paths.htm">Include paths and symbols</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_t_proj_platf.htm">For Managed Make projects, select a 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_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_autosave.htm">Autosaving on manual build</a><br>
@@ -70,6 +70,7 @@
<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_expressions.htm">Add and expression</a><br>
<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_registers.htm">Change registers or how they are displayed</a><br>
<img src="../images/trans.gif" border="0" width="75" height="1" alt=""><a style="text-decoration:none" href="cdt_t_memory.htm">Change memory or how it is displayed</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_t_search.htm">Searching the CDT</a><br>
diff --git a/doc/org.eclipse.cdt.doc.user/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index b44f62c314f..0f21698da30 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -4,7 +4,7 @@
<toc id="cdt" label="C/C++ Development User Guide" topic="concepts/cdt_o_home.htm">
-<topic label="Tutorial" href="getting_started/cdt_o_tutorial.htm">
+<topic label="Getting Started" href="getting_started/cdt_o_tutorial.htm">
<link toc="topics_Getting_Started.xml" />
</topic>
<topic label="Concepts" href="concepts/cdt_o_concepts.htm">
@@ -16,4 +16,6 @@
<topic label="Reference" href="reference/cdt_o_ref.htm">
<link toc="topics_Reference.xml" />
</topic>
+<topic label="Before you begin" href="concepts/cdt_c_before_you_begin.htm"/>
+<topic label="What's new" href="concepts/cdt_c_whatsnew.htm"/>
</toc>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
index d4199f74ab3..6605a68fd16 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
@@ -3,7 +3,6 @@
<!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
<toc label="Concepts">
- <topic label="What's new" href="concepts/cdt_c_whatsnew.htm"/>
<topic label="CDT overview" href="concepts/cdt_c_over_cdt.htm"/>
<topic label="CDT Projects" href="concepts/cdt_o_projects.htm">
<topic label="CDT projects" href="concepts/cdt_c_projects.htm"/>
@@ -18,6 +17,7 @@
</topic>
<topic label="Build" href="concepts/cdt_o_build_conc.htm">
<topic label="Build overview" href="concepts/cdt_c_build_over.htm"/>
+ <topic label="Manage Build Extensibility Document" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project"/>
</topic>
<topic label="Debug" href="concepts/cdt_o_dbg_concepts.htm">
<topic label="Debug overview" href="concepts/cdt_c_over_dbg.htm"/>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml b/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
index d79a13f1362..6fd873c6257 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
@@ -3,6 +3,8 @@
<!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
<toc label="Tutorial">
+ <topic label="Managed Make Hello World Tutorial" href="getting_started/cdt_w_basic.htm"/>
+ <topic label="Standard Make Hello World Tutorial" href="getting_started/cdt_w_standard.htm"/>
<topic label="Creating your project" href="getting_started/cdt_w_newproj.htm"/>
<topic label="Creating your C++ file" href="getting_started/cdt_w_newcpp.htm"/>
<topic label="Creating your makefile" href="getting_started/cdt_w_newmake.htm"/>
@@ -10,5 +12,4 @@
<topic label="Debugging your project" href="getting_started/cdt_w_debug.htm"/>
<topic label="How to bring C/C++ source files into Eclipse" href="getting_started/cdt_w_existing_code.htm"/>
<topic label="Updating the CDT" href="getting_started/cdt_w_install_cdt.htm"/>
- <topic label="Managed Make Hello World Tutorial" href="getting_started/cdt_w_basic.htm"/>
</toc>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 41bfa9f1eec..e9339964d3b 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -16,22 +16,22 @@
</topic>
<topic label="CDT icons" href="reference/cdt_u_icons.htm"/>
</topic>
- <topic label="C/C++ Preferences" href="reference/cdt_u_c_pref.htm">
+ <topic label="C/C++ preferences" href="reference/cdt_u_c_pref.htm">
<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 page, Preferences window" href="reference/cdt_u_c_editor_gen.htm"/>
- <topic label="Annotations page, Preferences window" href="reference/cdt_u_c_editor_anno.htm"/>
- <topic label="Colors page, Preferences window" href="reference/cdt_u_c_editor_color.htm"/>
- <topic label="Content Assist page, Preferences window" href="reference/cdt_u_c_editor_con_assist.htm"/>
- <topic label="Navigation page, Preferences window" href="reference/cdt_u_c_editor_navigation.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="Code Templates page, Preferences window" href="reference/cdt_u_code_temp.htm"/>
- <topic label="Make Targets page, Preferences window" href="reference/cdt_u_make_targets_pref.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 page, C/C++ Properties window" href="reference/cdt_u_newproj_buildset.htm"/>
+ <topic label="Make Builder" href="reference/cdt_u_newproj_buildset.htm"/>
<topic label="Error Parsers, C/C++ Properties window" href="reference/cdt_u_newproj_parser_error.htm"/>
- <topic label="Binary Parser page, C/C++ Properties window" href="reference/cdt_u_newproj_parser_binary.htm"/>
- <topic label="Paths and Symbols page, C/C++ Properties window" href="reference/cdt_u_newproj_pathsymb.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 dialog box" href="reference/cdt_u_scanner_cfg_disc.htm"/>
<topic label="Manage include paths dialog box" href="reference/cdt_u_newproj_incl_path.htm"/>
<topic label="Manage defined symbols dialog box" href="reference/cdt_u_newproj_def_symb.htm"/>
@@ -39,13 +39,13 @@
</topic>
</topic>
<topic label="Run and Debug dialog boxes" href="reference/cdt_o_run_dbg_pages.htm">
- <topic label="Main page, Run or Debug dialog box" href="reference/cdt_u_run_dbg_main.htm"/>
- <topic label="Arguments page, Run or Debug dialog box" href="reference/cdt_u_run_dbg_arg.htm"/>
- <topic label="Environment page, Run or Debug dialog box" href="reference/cdt_u_run_dbg_env.htm"/>
- <topic label="Debugger page, Run or Debug dialog box" href="reference/cdt_u_run_dbg_dbg.htm"/>
- <topic label="Source page, Run or Debug dialog box" href="reference/cdt_u_run_dbg_srce.htm"/>
- <topic label="Common page, Run or Debug dialog box" href="reference/cdt_u_run_dbg_comm.htm"/>
+ <topic label="Main" href="reference/cdt_u_run_dbg_main.htm"/>
+ <topic label="Arguments" href="reference/cdt_u_run_dbg_arg.htm"/>
+ <topic label="Environment" href="reference/cdt_u_run_dbg_env.htm"/>
+ <topic label="Debugger" href="reference/cdt_u_run_dbg_dbg.htm"/>
+ <topic label="Source" href="reference/cdt_u_run_dbg_srce.htm"/>
+ <topic label="Common" href="reference/cdt_u_run_dbg_comm.htm"/>
</topic>
- <topic label="C/C++ Search page, Search dialog box" href="reference/cdt_u_search.htm"/>
+ <topic label="C/C++ Search" href="reference/cdt_u_search.htm"/>
</toc>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index 4f17411df4c..7f5b43bb3ee 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -3,73 +3,72 @@
<!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
<toc label="Tasks">
- <topic label="Update your installation of the CDT" href="cdt_t_update_man.htm"/>
- <topic label="Creating a project" href="cdt_t_proj_new.htm"/>
- <topic label="Work with C or C++ project files" href="cdt_o_proj_files.htm">
- <topic label="Display file members in the C/C++ Projects view" href="cdt_t_show_proj_files.htm"/>
- <topic label="Assign a C or C++ nature to a project" href="cdt_t_conv_proj.htm"/>
- <topic label="Create a cpp file" href="cdt_t_new_cpp.htm"/>
- <topic label="Create a makefile" href="cdt_t_new_make.htm"/>
- <topic label="Hide files of a given type" href="cdt_t_prvw_hide_files.htm"/>
+ <topic label="Creating a project" href="tasks/cdt_t_proj_new.htm"/>
+ <topic label="Work with C or C++ project files" href="tasks/cdt_o_proj_files.htm">
+ <topic label="Display file members in the C/C++ Projects view" href="tasks/cdt_t_show_proj_files.htm"/>
+ <topic label="Assign a C or C++ nature to a project" href="tasks/cdt_t_conv_proj.htm"/>
+ <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>
- <topic label="Write code" href="cdt_o_write_code.htm">
- <topic label="Customize the C/C++ editor" href="cdt_t_cust_cpp_editor.htm"/>
- <topic label="Comment out code" href="cdt_t_comment_out.htm"/>
- <topic label="Use Content Assist" href="cdt_o_con_assist.htm">
- <topic label="Inserting code elements and code templates into your code" href="cdt_t_contentassist.htm"/>
- <topic label="Creating and editing code templates" href="cdt_t_add_codetemp.htm"/>
- <topic label="Importing and exporting code templates" href="cdt_t_imp_code_temp.htm"/>
+ <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"/>
+ <topic label="Comment out code" href="tasks/cdt_t_comment_out.htm"/>
+ <topic label="Use Content Assist" href="tasks/cdt_o_con_assist.htm">
+ <topic label="Inserting code elements and code templates into your code" href="tasks/cdt_t_contentassist.htm"/>
+ <topic label="Creating and editing code templates" href="tasks/cdt_t_add_codetemp.htm"/>
+ <topic label="Importing and exporting code templates" href="tasks/cdt_t_imp_code_temp.htm"/>
</topic>
- <topic label="Shift lines of code to the left or right" href="cdt_t_shift_code.htm"/>
- <topic label="Search for C/C++ elements" href="cdt_t_search.htm"/>
- <topic label="Navigate to C/C++ declarations by name" href="cdt_t_open_declarations.htm"/>
+ <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>
- <topic label="Build your C or C++ projects" href="cdt_o_build_task.htm">
- <topic label="Rename a project" href="cdt_t_proj_rename.htm"/>
- <topic label="Select referenced projects" href="cdt_t_proj_ref.htm"/>
- <topic label="Configure Project Builds" href="cdt_t_proj_build_set.htm"/>
- <topic label="Control which build errors are displayed" href="cdt_t_proj_error_parser.htm"/>
- <topic label="Select a binary parser" href="cdt_t_proj_parser.htm"/>
- <topic label="Include paths and symbols" href="cdt_t_proj_paths.htm"/>
- <topic label="Select deployment platform for managed make projects" href="cdt_t_proj_platf.htm"/>
- <topic label="Set build order" href="cdt_t_setbuildorder.htm"/>
- <topic label="Build your project as required" href="cdt_t_manualbuild.htm"/>
- <topic label="Autosaving on manual build" href="cdt_t_autosave.htm"/>
- <topic label="Add a make target" href="cdt_t_addmaketarget.htm"/>
- <topic label="Customize the Console view" href="cdt_t_cbuild_pref.htm"/>
- <topic label="View and manage compile errors" href="cdt_o_tasksview.htm">
- <topic label="Jump to errors" href="cdt_t_jumperror.htm"/>
- <topic label="Filter errors" href="cdt_t_filtererror.htm"/>
- <topic label="Set reminders" href="cdt_t_setreminder.htm"/>
+ <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"/>
+ <topic label="Select referenced projects" href="tasks/cdt_t_proj_ref.htm"/>
+ <topic label="Configure Project Builds" href="tasks/cdt_t_proj_build_set.htm"/>
+ <topic label="Control which build errors are displayed" href="tasks/cdt_t_proj_error_parser.htm"/>
+ <topic label="Select a binary parser" href="tasks/cdt_t_proj_parser.htm"/>
+ <topic label="Include paths and symbols" href="tasks/cdt_t_proj_paths.htm"/>
+ <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="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"/>
+ <topic label="View and manage compile errors" href="tasks/cdt_o_tasksview.htm">
+ <topic label="Jump to errors" href="tasks/cdt_t_jumperror.htm"/>
+ <topic label="Filter errors" href="tasks/cdt_t_filtererror.htm"/>
+ <topic label="Set reminders" href="tasks/cdt_t_setreminder.htm"/>
</topic>
</topic>
- <topic label="Run/debug your C or C++ projects" href="cdt_o_run.htm">
- <topic label="Specify a project and application to run" href="cdt_o_run_config.htm">
- <topic label="Select a run or debug configuration" href="cdt_t_run_config.htm"/>
- <topic label="Create a run or debug configuration" href="cdt_t_new_run_config.htm"/>
- <topic label="Specify a project and application" href="cdt_t_run_main.htm"/>
- <topic label="Specify the execution arguments and the working directory" href="cdt_t_run_arg.htm"/>
- <topic label="Set the environment variables and values" href="cdt_t_run_env.htm"/>
- <topic label="Select a debugger" href="cdt_t_run_dbg.htm"/>
- <topic label="Specify the location of source files" href="cdt_t_run_source.htm"/>
- <topic label="Specifying the location of the run configuration" href="cdt_t_run_com.htm"/>
+ <topic label="Run/debug your C or C++ projects" href="tasks/cdt_o_run.htm">
+ <topic label="Specify a project and application to run" href="tasks/cdt_o_run_config.htm">
+ <topic label="Select a run or debug configuration" href="tasks/cdt_t_run_config.htm"/>
+ <topic label="Create a run or debug configuration" href="tasks/cdt_t_new_run_config.htm"/>
+ <topic label="Specify a project and application" href="tasks/cdt_t_run_main.htm"/>
+ <topic label="Specify the execution arguments and the working directory" href="tasks/cdt_t_run_arg.htm"/>
+ <topic label="Set the environment variables and values" href="tasks/tasks/cdt_t_run_env.htm"/>
+ <topic label="Select a debugger" href="tasks/cdt_t_run_dbg.htm"/>
+ <topic label="Specify the location of source files" href="tasks/cdt_t_run_source.htm"/>
+ <topic label="Specifying the location of the run configuration" href="tasks/cdt_t_run_com.htm"/>
</topic>
- <topic label="Debug an application" href="cdt_o_debug.htm">
- <topic label="Start a debug session" href="cdt_t_debug_prog.htm"/>
- <topic label="Add, remove, enable or disable breakpoints and watchpoints" href="cdt_o_brkpnts_watch.htm">
- <topic label="Add breakpoints" href="cdt_t_add_brkpnts.htm"/>
- <topic label="Add watchpoints" href="cdt_t_add_watch.htm"/>
- <topic label="Remove breakpoints and watchpoints" href="cdt_t_rem_wtch_brk.htm"/>
- <topic label="Enable or disable breakpoints and watchpoints" href="cdt_t_endis_able_brk_wtch.htm"/>
+ <topic label="Debug an application" href="tasks/cdt_o_debug.htm">
+ <topic label="Start a debug session" href="tasks/cdt_t_debug_prog.htm"/>
+ <topic label="Add, remove, enable or disable breakpoints and watchpoints" href="tasks/cdt_o_brkpnts_watch.htm">
+ <topic label="Add breakpoints" href="tasks/cdt_t_add_brkpnts.htm"/>
+ <topic label="Add watchpoints" href="tasks/cdt_t_add_watch.htm"/>
+ <topic label="Remove breakpoints and watchpoints" href="tasks/cdt_t_rem_wtch_brk.htm"/>
+ <topic label="Enable or disable breakpoints and watchpoints" href="tasks/cdt_t_endis_able_brk_wtch.htm"/>
</topic>
- <topic label="Control your debug execution" href="cdt_t_controldebug.htm"/>
- <topic label="Work in disassembly mode" href="cdt_t_disassembly.htm"/>
- <topic label="View or change a variable" href="cdt_t_variables.htm"/>
- <topic label="Add and expression" href="cdt_t_expressions.htm"/>
- <topic label="Change registers or how they are displayed" href="cdt_t_registers.htm"/>
- <topic label="Change memory or how it is displayed" href="cdt_t_memory.htm"/>
+ <topic label="Control your debug execution" href="tasks/cdt_t_controldebug.htm"/>
+ <topic label="Work in disassembly mode" href="tasks/cdt_t_disassembly.htm"/>
+ <topic label="View or change a variable" href="tasks/cdt_t_variables.htm"/>
+ <topic label="Add and expression" href="tasks/cdt_t_expressions.htm"/>
+ <topic label="Change registers or how they are displayed" href="tasks/cdt_t_registers.htm"/>
+ <topic label="Change memory or how it is displayed" href="tasks/cdt_t_memory.htm"/>
</topic>
</topic>
- <topic label="Searching the CDT" href="cdt_t_search.htm"/>
+ <topic label="Searching the CDT" href="tasks/cdt_t_search.htm"/>
</toc>