diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm index 2386d080d0c..a53e61613b5 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_projects.htm @@ -37,6 +37,26 @@ or let CDT generate the makefiles for you automatically.

You can toggle these modes (generate makefiles or not) at any time for existing project. Use properties.

+

When you create a new project, you are required to specify the project type. This project type will determine the toolchain and data, and tabs that the CDT uses. In the New CDT Project Wizard, you can choose from the following project types:

+ +

Project conversion

You can convert projects from C to C++ (or from C++ to C). If, for 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 b2eaf5fd9e6..d1783f004b7 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 @@ -9,17 +9,15 @@

Getting Started

-

These tutorials will guide you through the process of using the C/C++ Development Toolkit (CDT).

+

The following tutorials guide you through the process of using the C/C++ Development Toolkit (CDT) to:

-CDT Managed Make Tutorial
-CDT Standard Make Tutorial
-CDT Importing an Existing Project Tutorial (Managed Make)
-CDT Importing an Existing Project Tutorial (Standard Make)
-CDT Debugging Tutorial
+Create a simple application
+Import an existing project
+Debug a project

-How to bring C/C++ source into Eclipse
-Updating the CDT
+Import C/C++ source into Eclipse
+Install/update the CDT
@@ -28,7 +26,7 @@
CDT Home

-

IBM Copyright Statement

+

QNX Software Systems Copyright Statement

\ 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 25daf0a0c4c..7d32cd2ccf0 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 @@ -4,153 +4,119 @@ New CDT Project with generated makefile - Tutorial - - + -

CDT New Project Tutorial

- -
- - - - - - -
-

Tutorial image

+

Tutorial: Creating a simple application using the CDT

+ +

In this tutorial, you will use the CDT to create a simple 'Hello World' application. This tutorial describes the process of creating a new C++ project where the makefile is automatically created by the CDT.

+ +

Note: In an earlier version of the CDT, there were two separate project types: Managed make (automatically generated a makefile) and Standard make (required the user's makefile to build). In CDT 4.0, both of these types are combined; basically, the only available project type can be changed to Managed make or Standard make mode at any given time.

+ +

If you do not currently have the CDT installed, see the topic Installing and updating the CDT. +

+ +

To create a simple "Hello World" application using the CDT, you will perform the following steps:

+ +

Step 1: Creating a project

+
    +
  1. Select File > New > Project.

    +


    Click here to see an illustration (displayed in a separate window).


    2. +
  2. Select the type of project to create. For this tutorial, expand the C++ folder and select C++ Project. +


    The C++ Project wizard opens. Click here to see an illustration.

    +


    By default, the CDT filters the Toolchain and Project types that currently display in those lists are based on the language support for the C++ Project wizard you selected for this tutorial. +

  3. In the Project name field, type a name for the project. +
  4. From the Project types list, expand Executable and select Hello World C++ Example. This project type provides a simple Hello World application in C++, and the makefile is automatically created by the CDT. + +
  5. Select a required toolchain from the Toolchain list. +

    A toolchain is a set of tools (such as a compiler, linker, and assembler) intended to build your project. +Additional tools, such as a debugger, can be associated with a toolchain.
    +There can be several toolchains available, depending on the compilers installed on your system. +

    +
  6. Optional: If you want to change these default settings, click Advanced Settings at Step 10instead of clicking Finish. + +

    If the C++ perspective is not currectly set as the default, you are prompted to determined if you would like to this project to be associated with the C/C++ perspective. Click Yes.
    Click here to see an illustration.


    + +

    A project is created with the default settings and a full set of configurations based on the project type and toolchain you selected.

    + +
  7. If you clicked Next at Step 7, you can specify the basic properties for the new project, such as your name, copyright, and source information.


    + +

    Click here to see an illustration.


    + +
  8. Click Next. + +

    The Select Configurations window displays a list of configurations based on the project type and toolchain(s) you selected earlier.
    Click here to see an illustration.


    + +
  9. Click Finish. + +

    You should now see the new project in C/C++ Projects view.

    +

    If C/C++ perspective was not set as current before, it will be selected now.

    + +

    Step 2: Creating a new file for the project

    +

    Now, you will create a new .cpp file (such as main.cpp) that will contain some code that you will copy from another file into an editor.

    + +
      +
    1. Right-click on your project in the Navigator. +
    2. Select New > Source File. +

      You should now see the new project in the C/C++ Projects view under the project, and the new file opens in the Editor view.

      +
    + +

    Step 3: Enter and step through the code

    +
      +
    1. Copy the code from the file main.cpp +file that was just created. +

      +You can double click the main.cpp tab in the Editor +view to expand the view.
      +Note: Leave a blank line at the end of the code because it is required by some compilers.

      +

      On the tab in the Editor view, an asterisk character ("*") prefixes the file name. The asterisk indicates that the file has changed but has not been saved.

      +
    2. Notice that the Outline view has also been populated +with objects created from your code.

      +

      If you select an item from the Outline view, the +corresponding text in the editor is highlighted. +

    3. Save the main.cpp file by clicking File > Save or pressing CTRL+S. +
    4. Build your project by pressing CTRL+B.

      +

      You can read through the build messages in the Console view. +The project should build successfully, showing the following message:

      +

      Finished building target: HelloWorld.exe

      +
      +

      You will also see the Outline view has also been populated +with objects created from your code.

      +

      If you select an item from the Outline view, the +corresponding text in the editor is highlighted.

      5. +
    + +

    Step 4: Running the application

    +
      +
    1. To run your application within the C/C++ Perspective, click Run > Run... +
    2. Select C/C++ Local Application. +
    3. Click 'New'. +
    4. Click 'New'.

      + +

      A new Run Configuration is created. Its name and path to executable are provided by the project ('HelloWorld' in our case). + +

    5. Click 'Run'. +
    + +

    Step 5: Reviewing and interpreting the results in the Console view

    +

    Now, you should now see the Hello World application running in the Console view. +The Console also shows which application is running in a title bar. +You can configure this view to display different elements (such as user input elements) using different colors.

    +
      +
    1. Type in your name and press Enter. +

      The title bar in the Console view shows you when the program has terminated.

      + +
    2. You can click the other views to see the information that they contain. +
    +
    -IBM Copyright Statement +QNX Software Systems Copyright Statement \ No newline at end of file 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 deleted file mode 100644 index 6e2b7a6a31f..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic01.htm +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - Tutorial - - - - -

    Start Eclipse

    -

    We will now walk though the process of creating a simple 'Hello World' application using the CDT.

    -

    Note, there were 2 separate project types in CDT 3.x : 'Managed make' and 'Standard make'. First one -generates makefile automatically, second one requires user's makefile to build.

    -

    In CDT 4.0, both these types are combined. In general, the only available project type can be switched -to 'Managed make' or 'Standard make' mode at any time you wish.

    -

    Current tutorial will describe a process of new project creation using generated makefile.

    - - -

    The image below shows the standard Workbench. -If you have not already installed the CDT, you can find the procedures here.

    - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic02.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic02.htm deleted file mode 100644 index 17a1362c4e5..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic02.htm +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - Tutorial - - - - -

    Create a project

    - -

    You can now create a C/ C++ project by clicking File > New > Project.

    - - - \ 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 deleted file mode 100644 index 3df1892faff..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic03.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

    New Project Wizard

    - -

    You will now see the New Project wizard. Open a C or C++ folder and select corresponding project. -

    - - - \ 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 deleted file mode 100644 index cf16a99a9fd..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic04.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

    New Project

    -

    Enter a name for the project. You can also enter a new path for your project by deselecting the Use Default Location -checkbox and entering the new path in the Location text box.

    - - - \ 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 deleted file mode 100644 index 4b3cbde2d1d..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic05.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

    New Project (continue)

    -

    Select required project type (Executable, Shared Library or Static Library). -
    In this case a makefile will be created automatically by CDT.

    - - - \ 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 deleted file mode 100644 index dfb361c13c3..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic06.htm +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Tutorial - - - -

    New Project (continue)

    -

    Select required toolchain on the right pane.

    -

    Tool chain is a set of tools (compiler, linker, assembler) intended to build your project. -Additional tools, like debugger, can be associated with tool chain.
    -There can be several toolchains available, depending on compilers installed in your system. -

    -

    You can click Finish just on this page. A project will be created with -default settings and full set of configurations.
    -If you want change them, press Next

    - - - \ 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 deleted file mode 100644 index aff81177702..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic07.htm +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - Tutorial - - - -

    Select Configurations

    -

    If you pressed Next on the first Wizard page, 'Select Configurations' page will be shown.

    -

    Select configurations to be created.

    - - -

    Click Finish. A project will be created with default properties.
    -If you want change them, press Advanced Settings button before. Project -properties dialog will be displayed.

    - - - \ 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 deleted file mode 100644 index 14a3fc6553c..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic08.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

    New Project

    - -

    You should now see the new project in C/C++ Projects view.

    -

    If C/C++ perspective was not set as current before, it will be selected now.

    - - - \ 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 deleted file mode 100644 index 87a707dd760..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic09.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

    Create a file

    - -

    Create a new cpp file (such as main.cpp) by right clicking your project and selecting New > Source File.

    - - - \ 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 deleted file mode 100644 index 29cdd622a73..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic10.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

    New Project

    - -

    You should now see the new project in the C/C++ Projects view.

    - - - \ 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 deleted file mode 100644 index 45eca65a890..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic11.htm +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Tutorial - - - -

    New Project Files

    - -

    You should now see the new file located in the Projects View under the project, and the new file should be open in the Editor view.

    - - - - - \ 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 deleted file mode 100644 index eb75aba960d..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic12.htm +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - Tutorial - - - - -

    Enter code

    -

    Enter the code in the main.cpp -file that was just created. -You can double click the main.cpp tab in the Editor -view to expand the view.
    -Note: Leave a blank line at the end of the code, some compilers -require one.

    -

    You will notice an asterisk in front of the file name on the tab in -the Editor view. The asterisk indicates that the file has -changed but has not been saved.

    - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic13.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic13.htm deleted file mode 100644 index b75e3d07426..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic13.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

    Step through the code

    -

    You will also see the Outline view has also been populated -with objects created from your code.

    -

    If you select an item from the Outline view, the -corresponding text in the editor is highlighted.

    - - 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 deleted file mode 100644 index 64fddef5161..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic14.htm +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Tutorial - - - -

    Save the file

    -

    Now save the main.cpp file by clicking FILE > SAVE or typing CTRL+S, -and build your project by typing CTRL+B.

    -

    You can read through the build messages in the Console view. -The project should build successfully, showing the following message:

    -

    Finished building target: HelloWorld.exe

    - - 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 deleted file mode 100644 index b75e3d07426..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic15.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

    Step through the code

    -

    You will also see the Outline view has also been populated -with objects created from your code.

    -

    If you select an item from the Outline view, the -corresponding text in the editor is highlighted.

    - - 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 deleted file mode 100644 index 7170f0c6eaf..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic16.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

    Run the application

    -

    You can run your application within the C/C++ Perspective. To do so -click Run > Open Run Dialog...

    -

    - - 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 deleted file mode 100644 index 4e10069ef12..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic17.htm +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Tutorial - - - -

    Run Configuration

    -

    You should now see the Run dialog box.
    -Navigate to the left pane and select C/C++ Local Application. -Then press 'New' button (the leftmost in toolbar) or select -'New' from context menu.

    - - - 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 deleted file mode 100644 index 0b0a3cd11df..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic18.htm +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Tutorial - - - -

    Run Configuration (continue)

    -

    New Run Configuration created now.
    -Its name and path to executable are given from selected project ('HelloWorld' in our case). -You can change project or application using 'Browse' buttons on 'Main' tab. -

    -

    Press 'Run'

    - - 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 deleted file mode 100644 index 26b2431c84a..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic19.htm +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Tutorial - - - -

    Console View

    - -

    You should now see the application running in the Console view. -The Console will also show which application is running in a title bar. -You will notice that the view can be configured to display different elements (such as user input elements) in different colors.

    -

    Type in your name and hit Enter.

    - - - \ 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 deleted file mode 100644 index d986d5570ce..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_basic20.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

    Run complete

    - -

    The title bar in the Console view will show you when the program has terminated.

    - - - \ 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 4e25d759cff..dd3693f9328 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 @@ -7,18 +7,18 @@ -

    Building your project

    -

    Make output and build progress information is displayed in the +

    Building a project

    +

    The make output and build progress information displays in the Console view. The Make Targets view displays makefile actions. The Tasks view displays compile warnings or errors.

    -

    To build your project:

    +

    To build a project:

      -
    1. In the C/C++ Projects view, select the HelloWorld project.
      2. +
    2. In the C/C++ Projects view, select your project. For the tutorial, you want to select the HelloWorld project.
    3. Click Project > Build Project.

      4. If you see the error message:

      Exec error:Launching failed

      then CDT cannot locate the build command, usually make. -Either your path is not configured correctly or you do not have make +Either your path is not configured correctly, or you do not have make installed on your system.

    Related concepts

    Next: Debugging your project

    + href="cdt_w_debug.htm">Next: Debugging a project

    Back: Creating your makefile

    + href="cdt_w_newmake.htm">Back: Creating a makefile

    -IBM Copyright Statement

    +QNX Copyright Statement

    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 65308483f4d..c84576bfa00 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 @@ -10,23 +10,22 @@ -

    Debugging your project

    +

    Debugging a project

    The debugger lets you control the execution of your program by setting breakpoints, suspending executed programs, stepping through your code, and examining the contents of variables.

    To debug a project:

      -
    1. Click Run > Debug.

      The Debug dialog box - opens.

      2. -
    2. Double-click C++ Local.
      3. -
    3. In the Name box, type Hello World.
      4. +
    4. Click Run > Debug.

      The Debug window opens.

      5. +
    5. Double-click C++ Local Application.
      6. +
    6. In the Name field, type Hello World.

      7. You can now select this debug launch configuration by name the next time that you debug this project.

      -
    7. In the C/C++ Application box, type hello.exe.
      8. +
    8. In the Project box, type hello.exe.
    9. Click Debug.

      10. You will now see the debug perspective with the hello.exe application window open. - The C/C++ editor is repositioned in the perspective.

      + The C/C++ editor repositions in the perspective.

    10. In the left margin of the main.cpp window, double-click to set a breakpoint on:
       cout << "You just entered"
      11. @@ -47,11 +46,10 @@ examining the contents of variables.

      perspective remains open.
    -

    To learn more about the debug aids at your disposal, refer to the related -debug conceptual topics.

    +

    To learn more about the debugging, see to the related debug conceptual topics.

    - Back: Building your project   

    + Back: Building a project   

    Related concepts
    @@ -66,7 +64,7 @@ debug conceptual topics.

    Debug launch controls
     

    -IBM Copyright Statement +QNX Copyright Statement \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_existing_code.htm index f7618225827..8fe0980eb51 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 @@ -9,26 +9,147 @@ -

    How to bring C/C++ source files into Eclipse

    +

    Importing your C/C++ source files into Eclipse

    -

    A common scenario that you may encounter when starting to use the CDT, is determining how +

    Using the CVS Repository Exploring perspective, you can check +out modules or directories into existing projects, or create new +projects. A common scenario that you may encounter when starting to use the CDT, is determining how to bring existing C/C++ source files into Eclipse. There are a number of ways to do this. The scenarios described below are recommended approaches.

    -

    Create a project from CVS

    +

    Creating a project from source files in CVS

    If your existing source tree is managed in CVS, you can use the CVS Repository perspective to "Checkout As..." any folder in the repository. -The first time you "Checkout As...", the New Project wizard is launched and you need to +The first time you "Checkout As...", the New Project wizard launches and you need to create a C or C++ project for the folder. For more information, see Creating a project and Working with C/C++ project files.

    -

    A CVS checkout of the project into the project's location occurs. It is recommended that you eventually add and commit the CDT project files back into CVS. -The CDT project files include .project, .cdtproject and .cdtbuild (for Managed Build projects) and are located at the root folder of each CDT project.

    +

    After you perform a checkout operation, a CVS checkout of the project occurs into the project's location. It is recommended that you eventually add and commit the CDT project files back into CVS. +These files include .project, .cdtproject, and .cdtbuild (for Managed Build projects) and are located at the root folder of each CDT project.

    + +

    +Bringing code into the IDE from CVS differs slightly, depending on what +you're importing: +

    + + + +

    Importing a C/C++ project from CVS

    + +

    +To check out an existing C/C++ project from the CVS repository into your workspace, right-click the project in the CVS Repositories view, and select Check Out from the menu. A project with the same name as the CVS module is checked out in to your workspace. +

    -

    Create new projects from existing source roots

    +

    Importing C/C++ code from CVS

    + +

    +To check out existing C/C++ code that is not part of a project: +

    + +
      +
    1. + Right-click the module or directory in the CVS + Repositories view and choose Check Out As… + from the menu. + +

      + The Check Out As wizard dispalys. +

      + +
      + Check Out As + The Check Out As wizard. +
      +
      2. + +
    2. + Choose how to check out this project: + +
        +
      • + as a project configured using the New Project + wizard + +

        + or: +

        +
        • + +
      • + as a new project in the workspace + +

        + or: +

        +
        • + +
      • + as a Standard Make C/C++ Project – if you need to create your own + Makefile to integrate with an existing build + process +
        • +
      + +

      + Choose the workspace location for this project, then the CVS + tag to check out. +

    3. Click Finish to exit the Check Out As dialog. +

      + +
    4. Click Next to continue. +
    + +

    Importing C/C++ code into an existing project

    + +

    +To import a directory full of C/C++ code into an existing project: +

    + +
      +
    1. + Right-click the module or directory in the CVS + Repositories view and choose Check Out As… + from the menu. + +

      + The IDE displays the Check Out As dialog. +

      + +
    2. Choose Check out into an existing project, and then click + Next. + The IDE displays the Check Out Into dialog: + +

      + Check Out Into +

      +
      3. + +
    3. + Select an existing project from the list, and then + click Finish to add the code from CVS to the selected + project. +
      4. +
    + + +

    Creating new projects from existing source roots

    If your resource code is not managed in CVS but is available from the file system, then you need to perform two steps:
      @@ -54,7 +175,7 @@ index for the project and the link to the existing source, is stored in the meta directory in the workspace folder. For more information on the workspace folder, see Workbench User Guide > Tasks > Upgrading Eclipse.

      -Once you create a CDT project, you cannot easily move it or redefine its root folders. +After you create a CDT project, you cannot easily move it or redefine its root folders. If you need to, you can delete the CDT project (without deleting its contents) and then recreate it specifying a different non-default location. @@ -93,7 +214,7 @@ appropriate "root folder" to import from.


      Project properties

      -IBM Copyright Statement +QNX Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm index 54fe487a0a4..83b082b762d 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import.htm @@ -7,151 +7,57 @@ - + -

      CDT Importing an Existing Managed Make Project Tutorial

      - -
      - - - - - - -
      -

      Eclipse Workbench displaying The C++ Perspective

      -IBM Copyright Statement +

      Turorial: Importing an existing project

      + +

      The following tutorial will walk you though the process of importing a simple application using the CDT.

      + + +

      Step 1: You want to create a single project that will reflect all of the components for the existing source tree.

      +
        +
      1. Select File > New > Project. +
      2. For this tutorial, expand C++ and select C++ project. +


        The New Project wizard dispalys. Click here to see an illustration (displayed in a separate window).


        + + +
      3. In the Project name field, type a name for the project. +
      4. Ensure that the Use default location option is not selected because you will need to specify where the resources reside in the file system since they do not reside in your workspace. +
      5. In the Location field, specify the path for your project. For this tutorial, the project to import is assumed to reside in the directory C:\MySrcDirectory. +
      6. From the Project types list, expand Makefile Project and select Hello World C++ Project. +
      7. Click Next. +
      8. Select only the configurations you want created. Configurations display for each toolchain selected on the previous page of the wizard. +
      9. Click Finish to close the dialog box. +

        You will see the new project in the C/C++ Projects view. In addition, new 'dot' files in your legacy project's root directory, these are CDT project files.

        +
      + +

      Step 2: You are now ready to build your project.

      +
        +
      1. To build your project, select File > Build Project. +

        After the project build completes, the results display in the Console view and new objects, such as binaries and includes, show in the Projects view.

        +
      2. Review the results to ensure that there are no errors. + +

        Note: By default, the indexer is set to Fast indexer for the project to parse your project in the same way that a compiler does; beginning with each compilation unit and parsing that file and all files that it includes, except that it parses each header file included in a project only once. This method provides the most accurate index information. For large projects using complex C++ code, this indexer can be slow. For example, if a header file is included and takes two compilation units, the parsing of the second unit reuses the results of parsing the first unit. This is similar to how precompiled headers work. The indexing of large projects using the Fast indexer uses fewer resources than the Full indexer, but the resulting index is not quite as accurate.

        +
      + +

      Step 3: You are now ready to run your application.

      +
        +
      1. To run your application within the C/C++ Perspective, click Run > Run

        +

        The Run Configurations dialog displays.

        +
      2. To create a run configuration, select Local C/C++ Application and click OK. +
      3. Select the new run configuration in the Configurations view and click the Main tab to edit your run configuration. +
      4. Optional: You can change the name of your run configuration by entering a new name in the Name field. +
      5. To select the project, click Browse opposite the Project field. +
      6. From the Project Selection window, select the project and click OK. +
      7. Select the new C/C++ Application you want to execute by clicking Search. +
      8. From the Program Selection window, select an appropriate binary from the list and click OK. +
      9. Click Apply to save the run configuration and then click Run. +

        The application runs in the Console view. The Console also shows which application it is currently running in the title bar. You can configure the view to display different elements, such as user input elements using different colors.

        +
      +QNX Copyright Statement diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import01.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import01.htm deleted file mode 100644 index 88190f2200f..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import01.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      C/C++ Perspective

      -

      We will now walk though the process of importing a simple Managed Make application using the CDT.

      -

      The image below shows the standard workbench with the C/C++ Perspective.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import02.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import02.htm deleted file mode 100644 index 21970fad1a8..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import02.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Create a project

      - -

      Create a new C/ C++ project for your existing code by clicking File > New > Project.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import03.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import03.htm deleted file mode 100644 index d41030c0967..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import03.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      New Project Wizard

      - -

      You will now see the New Project wizard. For this example open a C++ project and select Managed Make project.

      -

      A Standard Make C/C++ project requires you to provide a makefile, a Managed Make project will create one for you. So if your project already has a makefile you would choose a Standard Make project.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import04.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import04.htm deleted file mode 100644 index b307700bae7..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import04.htm +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Tutorial - - - - - -

      New Project

      -

      Enter a name for the project and enter the path for your project by deselecting the Use Default -checkbox and entering the path to your project in the Directory text box. For this tutorial, the project to be imported is assumed to reside in the directory C:\MySrcDirectory.

      -

      Click Next.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import05.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import05.htm deleted file mode 100644 index fce82abb22c..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import05.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Select a Project Type

      -

      Select the type of project that you want to build, and the default configurations to be created.

      -

      Click Next.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import07.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import07.htm deleted file mode 100644 index 773bf47cc86..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import07.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Additional Project Settings

      -

      Click the C/C++ Indexer tab and select No Indexer for now. You will enable indexing later, otherwise search capabilities, and other tools that require search, will be disabled for your project. -

      Click Finish to close the dialog box.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import08.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import08.htm deleted file mode 100644 index 33bbf23c4a8..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import08.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      New Project

      - -

      You should now see the new project in the C/C++ Projects view.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import09.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import09.htm deleted file mode 100644 index 7dbb1380f77..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import09.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Project Files

      - -

      You should also see new 'dot' files in your legacy project's root directory, these are CDT project files.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import10.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import10.htm deleted file mode 100644 index 566f6ee835c..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import10.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Build Project

      - -

      You can now build your project by selecting Project > Build All from the file menu.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import11.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import11.htm deleted file mode 100644 index 9764243de3c..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import11.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Build Project

      - -

      After the project's build is complete, the results will be displayed in the Console view and new objects, such as binaries and includes, will be shown in the Projects view.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import12.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import12.htm deleted file mode 100644 index 5fabd084272..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import12.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Change Project Properties

      - -

      You should now enable the indexer, to do so right click on the project and select Properties.

      - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import13.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import13.htm deleted file mode 100644 index 999cc79ddd9..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import13.htm +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Tutorial - - - -

      C/C++ Indexer

      - -

      Select C/C++ Indexer and click Enable C/C++ Indexing. The Indexer is required for search capabilities and other tools that require search. If the indexer is not selected these tools will be disabled for your project.

      - - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import14.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import14.htm deleted file mode 100644 index efdd267fa3e..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import14.htm +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Tutorial - - - - -

      C/C++ Indexer

      - -

      The indexer will now start discovery, you can monitor the progress in the bottom right corner of the eclipse window. Please keep in mind this can take a substantial amount of time for very large projects.

      - - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import15.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import15.htm deleted file mode 100644 index b1045149b14..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import15.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Run the application

      - -

      You can run your application within the C/C++ Perspective, to do so click Run > Run...

      - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import16.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import16.htm deleted file mode 100644 index d4bc8d35834..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import16.htm +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Tutorial - - - -

      Run Configuration

      - -

      You should now see the Run Configurations dialog box, navigate to the Configurations: view, selectC/C++ Local and click New. -This will create your Run Configuration.

      - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import17.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import17.htm deleted file mode 100644 index 9a80af8f31c..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import17.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Run Configuration

      - -

      Select the new run configuration in the Configurations: view and click the Main tab to edit your run configuration.

      -

      You can change the name of your run configuration by entering a new name in the Name: text area.

      - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import18.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import18.htm deleted file mode 100644 index ef026698d37..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import18.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Run Configuration

      - -

      To select the project, click the Browse button beside the Project: text area. From the Project Selection window, select the project and click OK.

      - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import19.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import19.htm deleted file mode 100644 index bb0cfe51a81..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import19.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Run Configuration

      - -

      Select the new C/C++ Application you want to execute by clicking the Search button and from the Program Selection window choose the appropriate binary from the list and click OK.

      - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import20.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import20.htm deleted file mode 100644 index 94f88eb2580..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import20.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Run Configuration

      - -

      Click Apply to save the run configuration and then click Run.

      - - - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import21.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import21.htm deleted file mode 100644 index ffac163fd16..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_import21.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Console View

      - -

      You should now see the application running in the Console view. -The Console will also show which application is running in a title bar. -You will notice that the view can be configured to display different elements (such as user input elements) in different colors.

      - - diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm index ef0a707e8c9..51bec6ae277 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_install_cdt.htm @@ -14,55 +14,69 @@ function changeSize(theImage,wd,ht) { theImage.style.width=wdth; theImage.style.height=hght; } + -

      Updating the CDT

      +

      Installing and updating the CDT

      -

      The CDT can be updated directly from the workbench using your internet connection.

      +

      You can use the Software Updates manager to quickly install or update the CDT directly from the Eclipse workbench using your internet connection.

      +

      To obtain the latest CDT features:

        -
      1. Click Help > Software Updates > Find and Install.
        - Help, Software Updates, Find and Install Menu selection
         
        2. +
      2. Select Help > Software Updates > Find and Install.


        +

        Click here to see an illustration (displayed in a separate window).

        +
        3. -
      3. In the Feature Updates window select Search for new features to install and click Next.
        - Feature Updates dialog box
         
        4. +
      4. In the Feature Updates window, select Search for new features to install and click Next.

        Note: If you want to search for updates on features that you currently have installed, you can select the option Search for updates of the currently installed features.



        Click here to see an illustration.

        +
        5. -
      5. If you have not updated previously, you will have to enter the location of the CDT Install site. Click - the Add Update Site... button.
        - Add Update Sites dialog box
         
        6. +
      6. If you have not updated previously, you will have to enter the location of the Eclipse CDT Install site. Click New Remote Site....


        +

        Click here to see an illustration.

        +
        7. -
      7. In the New Update Site dialog box, enter a name and the URL for the update site in the spaces provided.
        - Install New Site dialog box
         
        8. +
      8. In the New Update Site dialog box, type the name and URL for the Eclipe update site in the spaces provided.


        +

        Click here to see an illustration.


        9. -
      9. Select the update site you just created by clicking the appropriate checkbox and click Next.
        - Install Sites dialog box with the CDT site selcted
         
        10. +
      10. Click OK. +
      11. From the Sites to include in search list, select the update site you just created by clicking the appropriate check box, and click Finish.


        +

        Click here to see an illustration.

        +
        12. -
      12. A dialog box will appear showing the updates available from the update site, select each of the following features, - ensuring you have precisely the same version for each one: +
      13. The Search Results dialog shows the features available to install from the update site. Select each of the following features, + ensuring that you have precisely the same version for each one:
        • Eclipse C/C+ Development Tooling SDK
        • Eclipse C/C+ Development Tools
        - Then click Next.
        - Search Results dialog box
         
        14. +
      14. Expand and select any additional features that you require. De-select any options that do not apply to you. +
      15. Click Next.


        +

        Click here to see an illustration.


        +
        16. -
      16. You should now see the Eclipse.org Software User Agreement, you must accept the agreement to install the CDT update. - Do so by selecting I accept the terms in the license agreement and then click Next.
        - Feature License dialog box
         
        17. +
      17. You must accept the Eclipse.org Software User Agreement to continue installing the CDT update. If you accept the terms, select I accept the terms in the license agreement and then click Next.


        +

        Click here to see an illustration.

        +
        18. +

        You can review the summary list of the features you selected to install.

        +

      18. Optional: Click Change Location to select the location you would like the updates installed. Typically, this is the directory where you installed Eclipse. +
      19. Click Finish.


        Click here to see an illustration.

        +
        20. -
      20. Now select the location you would like the updates installed, usually this is the directory where you installed Eclipse, - and click Finish.
        - Install Location dialog box
         
        21. +
      21. You will now start downloading the CDT components. You will have to verify that you want the features installed by clicking + Install for each feature you selected.


        +

        Click here to see an illustration.

        +
        22. -
      22. You will now start downloading the CDT components. You will have to verify that you want the features installed by clicking - Install for each feature you selected.
        - Feature Verification dialog box
         
        23. - -
      23. You will now have to restart Eclipse, select Yes to complete the update.
        - Install/Update prompt to restart Eclipse +

        Now, you have to restart Eclipse. +

      24. Select Yes to complete the feature installation process.


        + +

        Click here to see an illustration.

      Related concepts
      @@ -70,7 +84,7 @@ function changeSize(theImage,wd,ht) { C/C++ Development perspective
       

      -IBM Copyright Statement

      +QNX Copyright Statement

      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 2e762d412e8..866cb4729de 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 @@ -14,12 +14,11 @@

      You can begin coding your HelloWorld program. The .cpp file that you create will be saved in the project folder you just created -Creating your project.

      +Creating a project.

      Files are edited in the C/C++ editor located to the right of the C/C++ Projects view. The left margin of the C/C++ editor, called the marker -bar, displays icons for -items such as bookmarks, breakpoints, and compiler errors and warnings.

      +bar, displays icons for items such as bookmarks, breakpoints, and compiler errors and warnings.

      For more information about:

        @@ -28,13 +27,13 @@ items such as bookmarks, breakpoints, and compiler errors and warnings.

      • The editor area, see Workbench User Guide > Reference > User interface information > Views and editors > Editor area
      -

      To create your C++ file:

      +

      To create a C++ file:

      1. In the C++ Projects view, right-click the HelloWorld project folder, and select New > File.
        2. -
      2. In the File name box, type main.cpp.
        3. +
      3. In the File name field, type main.cpp.
      4. Click Finish.
        5. -
      5. Type the code below in the editor. Lines are indented with tab +
      6. Type the code, exactly as it appears below, in the editor. Lines are indented with tab characters, not with spaces.
        7. @@ -74,8 +73,8 @@ items such as bookmarks, breakpoints, and compiler errors and warnings.

      Your new .cpp file is displayed in the C/C++ Projects -view and in the Project Explorer view. Your project now contains main.cpp. Before you -can build your HelloWorld project, you must next create a makefile.

      +view and in the Navigator view. Your project now contains main.cpp. Before you +can build your HelloWorld project, you must create a makefile.

      @@ -99,7 +98,7 @@ can build your HelloWorld project, you must next create a makefile.

      C/C++ Projects view

      -IBM Copyright Statement +IBM Copyright Statement \ No newline at end of file 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 c5303e64e22..a5bdcdea0a1 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 @@ -6,19 +6,24 @@ Creating your makefile + -

      Creating your makefile

      +

      Creating a makefile

      -

      For the purpose of this tutorial, you were instructed to create a Standard -Make C++ Project which requires you to create a makefile. Managed Make C/C++ projects generate makefiles for you.

      +

      For the purpose of this tutorial, you were instructed to create a C++ Project which requires you to create a makefile.

      -

      To create your makefile:

      +

      To create a makefile:

      1. In the C++ Projects view, right-click the HelloWorld project - folder and select New > File.
        2. + folder and select New > File. +


        Click here to see an illustration (displayed in a separate window).


      2. In the File name box, type makefile.
      3. Click Finish.
      4. Type the gnu make instructions below in the editor. Lines are @@ -43,8 +48,9 @@ Make C++ Project which requires you to create a makefile. Managed Make C/C++ pro Save.

      Your new makefile, along with your main.cpp file are -displayed in the C/C++ Projects view and in the Project Explorer view. Your project now +displayed in the C/C++ Projects view and in the Navigator view. Your project now contains main.cpp and makefile. You can now build your HelloWorld project.

      +

      Click here to see an illustration.

      @@ -69,7 +75,7 @@ contains main.cpp and makefile. You can now build your HelloWorld project.

      C/C++ Projects view

      -IBM Copyright Statement +IBM Copyright Statement \ No newline at end of file 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 878cc527a2b..cbb09f25d75 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 @@ -5,40 +5,82 @@ Creating your project + -

      Creating your project

      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.

      -To create your project:

        -
      1. Click File > New > Project.
        The New Project Wizard opens. + + +

        Creating a project

        + +

        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.

        + +

        To create a project:

        + +
          +
        1. Select File > New > Project. +


          When you create a new project, you are required to specify the project type. This project type will determine the toolchain, data, and tabs that the CDT uses/displays.


          +
        2. Select the type of project to create. For this tutorial, expand the C++ folder and select C++ Project. +

          The C++ Project wizard opens. Click here to see an illustration.


          +

          By default, the CDT filters the Toolchain and Project types that currently display in those lists are based on the language support for the C++ Project wizard you selected for this tutorial.


          +
        3. In the Project name field, type HelloWorld. +
        4. Leave the Use Default Location option selected. +


          Next, you want to select the type of project to create. In the New CDT Project Wizard, you can choose from the following project types:

          +
            +
          • Executable - Provides an executable application. This project type folder contains three templates.

            +
              +
            • Hello World C++ Example provides a simple C++ Hello World application with main(). +
            • Hello World ANSI C Example provides a simple C Hello World application with main().
            • Empty Project provides a single source project folder that contains no files. +
            + +

            After you select a template, the result is a project with only the meta-data files required for the project type. You are expected to modify these source files, as required, and provide source files for the project's target.

            The makefile for the Executable project type is automatically created by the CDT.

            +
          • Shared Library - An executable module that is compiled and linked separately. When you create a project that uses a shared library (libxx.so), you define your shared library's project as a Project Reference for your application. For this project type, the CDT combines object files together and joins them so they're relocatable and can be shared by many processes. Shared libraries are named using the format +libxx.so.version, where +version is a number with a default of 1. The +libxx.so file usually is a symbolic link to the +latest version. The makefile for this project type is automatically created by the CDT. +
          • Static Library - A collection of object files that you can link into another application (libxx.a). The CDT combines object files (i.e. *.o) +into an archive (*.a) that is directly linked into an +executable. The makefile for this project type is automatically created by the CDT. +
          • Makefile Project - Creates an empty project without the meta-data files. This selection is useful for importing and modifying existing makefile-based projects; a new makefile is not created for this project type. +
          +

          By default, the CDT filters the Toolchain and Project types that currently display in those lists based on the language support for the C++ Project wizard you selected for this tutorial. +

        5. From the Project types list, expand Executable and select Hello World C++ Example. This project type provides a simple Hello World application in C++, and the makefile is automatically created by the CDT. + +
        6. Select a required toolchain from the Toolchain list. +

          A toolchain is a set of tools (such as a compiler, linker, and assembler) intended to build your project. +Additional tools, such as a debugger, can be associated with a toolchain.
          +There can be several toolchains available, depending on the compilers installed on your system. +

          +
          7. -
        7. Select C++.
          8. -
        8. Click Standard Make C++ Project.
          You can also create a managed -make C++ project so that a makefile is automatically generated. For the -purpose of this tutorial, you will create a standard make C++ project which -requires you to provide a makefile in order to build the project.
        9. Click Next.
          10. -
        10. In the Name box, type HelloWorld.
          11. -
        11. Leave the Use Default Location check box selected.
          Note that -the location of the workspace folder where your project is saved is grayed -out in the Location box.
          12. -
        12. Click Next.
          13. -
        13. Click the Binary Parser tab.
          14. -
        14. In the Binary Parser list, click PE Windows Parser.
          15. +
        15. Click Advanced Settings. +
        16. Click the Binary Parser tab. +


          Click here to see an illustration.


          +
          17. +
        17. In the Binary Parser list, select PE Windows Parser.

          18. To ensure the accuracy of the C/C++ Projects view and the ability to successfully -run and debug your programs, select the correct parser is important. After +run and debug your programs, selecting the correct parser is important. After you select the correct parser for your development environment and build your project, you can view the components of the .o file in the C/C++ Projects -view. You can also view the contents of the .o file in the C/C++ editor. +view. You can also view the contents of the .o file in the C/C++ editor.

        18. Click Finish.
          19. -
        19. If a message box prompts you to switch perspectives, click Yes. +
        20. If a message box prompts you to change perspectives, click Yes.
          21. -

        Your new project is displayed in the C/C++ Projects view and in -the Project Explorer view. Your project is empty because you have not yet created -files for your project. You can now start writing the code for your HelloWorld -program.

        Tip: You can view and modify the properties of your -HelloWorld project by right-clicking on the project in the C/C++ Projects +

      + +

      Your new project displays in the C/C++ Projects view, and in +the Navigator view. Your project is empty because you have not yet created +files for your project. You can now start writing the code for your HelloWorld +program.

      + +

      Tip: You can view and modify the properties of your +HelloWorld project by right-clicking on the project in the C/C++ Projects view and clicking Properties.

      Next: Creating your C++ file

      For more information @@ -56,7 +98,7 @@ border="0">
      Defining project propert src="../images/ngref.gif" alt="Related reference" height="21" width="143" border="0">
      C/C++ Projects view

      -

      IBM Copyright Statement

      +

      QNX Copyright Statement

      \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm index c400fc9377c..740504422f1 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_prepare_workbench.htm @@ -6,6 +6,11 @@ Preparing the Workbench + @@ -13,34 +18,36 @@

      Preparing the Workbench

      This tutorial will get you started using the C/C++ Development Toolkit (CDT) in the Workbench.

      -

      In this section, you will verify that the workbench is properly set up for C/C++ development. It is assumed that:

      +

      First, you will verify that the workbench is properly configured for C/C++ development. It is assumed that:

      • Your Workbench has its default settings. -To reset the current perspective to its original layout, from the menu bar choose -Window > Reset Perspective.
        • -
      • You are familiar with the basic Workbench mechanisms, such as +To reset the current perspective to its original layout, from the menu bar select +Window > Reset Perspective.
        • +
      • You are familiar with the basic Workbench features, such as views and perspectives.
      -

      Setting the C/C++ Editor's operation and appearance

      +

      Setting the operation and appearance of the C/C++ Editor

        -
      1. Open the Workbench preferences: from the menu bar, select Window > Preferences.
        2. -
      2. Expand the C/C++ heading and click on C/C++ Editor. The Preferences C/C++ Editor dialog's General tab appears. -

        C/C++ Editor Preferences General page

        3. -
      3. Make any changes that you require to be comfortable editing files. -For example, you may want to enable Show line numbers or you may want to make the Problem indicator color a different shade of red. For more information see the General page Preferences window in the reference section.
        4. +
      4. To open the Workbench preferences, from the menu bar, select Window > Preferences.
        5. +
      5. Expand C/C++ and select Editor. -
      6. On the Preferences C/C++ Editor dialog, click the Colors tab. The Preferences C/C++ Editor dialog's Colors tab appears.

        -C/C++ Editor Preferences Color page +


        Click here to see an illustration (displayed in a separate window).

        7. +
      7. Make any changes that you require to be comfortable editing files. +For example, you might want to enable Show line numbers or change the Problem indicator color to a different shade of red. For more information about setting preferences in the editor, see General page Preferences window in the reference section.
        8. + +
      8. On the Preferences C/C++ Editor dialog, click the Colors tab. The Colors tab for the C/C++ Editor preferences dialog displays.


        Click here to see an illustration.


        Again, make any changes that will be useful for your working habits and click OK. For more information see the Color page Preferences window in the reference section.

      9. On the Preferences C/C++ Editor dialog, click the Content Assist tab. The Preferences C/C++ Editor dialog's Content Assist tab appears.
        -C/C++ Editor Preferences Content Assist page -
        If you want to set an auto-activation delay or change the background for completion proposals, do so now. For more information see the Content Assist page Preferences window in the reference section.
        10. +


        Click here to see an illustration.

        + + +


        If you want to set an auto-activation delay or change the background for completion proposals, do so now. For more information see the Content Assist page Preferences window in the reference section.


      10. Leave the preferences by clicking OK.
      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 deleted file mode 100644 index 76a2d03a5e0..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard01.htm +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - Tutorial - - - - -

      Start Eclipse

      -

      We will now walk though the process of creating a simple 'Hello World' application using the CDT and your own Makefile.

      -

      Note, there were 2 separate project types in CDT 3.x : 'Managed make' and 'Standard make'. First one -generates makefile automatically, second one requires user's makefile to build.

      -

      In CDT 4.0, both these types are combined. In general, the only available project type can be switched -to 'Managed make' or 'Standard make' mode at any time you wish.

      -

      Current tutorial will describe a process of new project creation using your own Makefile.

      - -

      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 here.

      - - - \ No newline at end of file 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 deleted file mode 100644 index 17a1362c4e5..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard02.htm +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - Tutorial - - - - -

      Create a project

      - -

      You can now create a C/ C++ project by clicking File > New > Project.

      - - - \ No newline at end of file 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 deleted file mode 100644 index 3df1892faff..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard03.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      New Project Wizard

      - -

      You will now see the New Project wizard. Open a C or C++ folder and select corresponding project. -

      - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm deleted file mode 100644 index cf16a99a9fd..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard04.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      New Project

      -

      Enter a name for the project. You can also enter a new path for your project by deselecting the Use Default Location -checkbox and entering the new path in the Location text box.

      - - - \ No newline at end of file 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 deleted file mode 100644 index 7dbd3bbabd5..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard05.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      New Project (continue)

      -

      Select 'Makefile project' on the left pane. -In this case, you must provide makefile yourself to build your project.

      - - - \ No newline at end of file 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 deleted file mode 100644 index 99a10254164..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard06.htm +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - Tutorial - - - -

      New Project (continue)

      -

      Select required toolchain on the right pane.

      -

      There can be several toolchains available, depending on compilers installed in your system.
      -Option 'Other toolchain' is usually default choice. In this case, toolchain settings -are defined automatically by CDT.

      -

      -

      Next page contains Configurations selection. Usually, we need not to go here while -creating project with user-provided makefile.

      -

      Click Finish.

      - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm deleted file mode 100644 index 14a3fc6553c..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard07.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      New Project

      - -

      You should now see the new project in C/C++ Projects view.

      -

      If C/C++ perspective was not set as current before, it will be selected now.

      - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm deleted file mode 100644 index 87a707dd760..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard08.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Create a file

      - -

      Create a new cpp file (such as main.cpp) by right clicking your project and selecting New > Source File.

      - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm deleted file mode 100644 index ed6219c9538..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard09.htm +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Tutorial - - - -

      Create a file

      - -

      You should now see the New File wizard.

      -

      Enter the name of your file in the File name text area then click Finish.

      - - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm deleted file mode 100644 index 45eca65a890..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard10.htm +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - Tutorial - - - -

      New Project Files

      - -

      You should now see the new file located in the Projects View under the project, and the new file should be open in the Editor view.

      - - - - - \ No newline at end of file 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 deleted file mode 100644 index eb75aba960d..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard11.htm +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - Tutorial - - - - -

      Enter code

      -

      Enter the code in the main.cpp -file that was just created. -You can double click the main.cpp tab in the Editor -view to expand the view.
      -Note: Leave a blank line at the end of the code, some compilers -require one.

      -

      You will notice an asterisk in front of the file name on the tab in -the Editor view. The asterisk indicates that the file has -changed but has not been saved.

      - - 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 deleted file mode 100644 index 443d1afa271..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard12.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Create a makefile

      - -

      Create the makefile by File > New > File.

      - - - \ No newline at end of file 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 deleted file mode 100644 index 8466028b5cf..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard13.htm +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - Tutorial - - - -

      Create a makefile

      - -

      You should now see the New File wizard.

      -

      Enter makefile for the name of the file in the File name text area then click Finish.

      - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm deleted file mode 100644 index ada483e64a0..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard14.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      Create a makefile

      - -

      Create the makefile by right clicking your project and selecting New > File.

      - - - \ No newline at end of file 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 deleted file mode 100644 index 2ffeabb0e01..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard15.htm +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - Tutorial - - - - -

      Enter the make script

      - -

      Enter the build instruction for your makefile that was just created. -The Outline view will display the structure of the makefile as you add components. -When you enter the code you will notice an asterisk in front of the file name on the tab in the Editor view, this tells you the file changed but has not been saved.

      - -

      Note: Ensure you have tabs, not spaces before your indented code, as make will not accept spaces before commands.

      - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm deleted file mode 100644 index d63d9caf02f..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard16.htm +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Tutorial - - - -

      New Makefile

      - -

      You should now see the new makefile located in the Projects view under the project, and the makefile should be open in the Editor view.

      - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm b/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm deleted file mode 100644 index f02253986c6..00000000000 --- a/doc/org.eclipse.cdt.doc.user/getting_started/cdt_w_standard17.htm +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - Tutorial - - - -

      Run the application

      - -

      Navigate to the C/C++ Projects view, you will now see the executables listed.

      - -

      You can run your application within the C/C++ Perspective, to do so click Run > Open Run Dialog.

      - -

      You should now see the Run dialog box, double click C/C++ Local Application. -This will create your Run Configuration. Select the new Run Configuration in the Configurations: view.

      -

      Use Browse button to locate executable to run.

      -

      Press Run

      - - - \ No newline at end of file diff --git a/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm b/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm index 3b38bd98fc2..e2d019c953f 100644 --- a/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm +++ b/doc/org.eclipse.cdt.doc.user/getting_started/hw_example.htm @@ -6,7 +6,7 @@ C++ Hello World example -Copy the code below and paste it into the main.cpp file in the Editor View: +Copy the code below and paste it into the main.cpp file in the Editor view: 
       #include <iostream>
@@ -17,7 +17,7 @@ int main()
 {
 	string yourName;
 
-	cout << "Enter your name: ";
+	cout << "Type your name: ";
 	cin  >> yourName;
 	cout << "Hello " + yourName << endl;
 
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
index 2fb00040fa8..ce4db2a8320 100644
--- a/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm
+++ b/doc/org.eclipse.cdt.doc.user/getting_started/make_example.htm
@@ -6,7 +6,7 @@
 	C++ Makefile example
 
 
-Copy the script below and paste it into the makefile file in the Editor View:
+Copy the script below and paste it into the makefile file in the Editor view:
 
 
       all: hello
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_debug_run01.png b/doc/org.eclipse.cdt.doc.user/images/cdt_debug_run01.png
new file mode 100644
index 00000000000..45bb17065ea
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_debug_run01.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_binparser01.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_binparser01.png
new file mode 100644
index 00000000000..9bac776a926
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_binparser01.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_cpp_perspectx.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_cpp_perspectx.png
new file mode 100644
index 00000000000..32452d6ca31
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_cpp_perspectx.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_newmake01.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_newmake01.png
new file mode 100644
index 00000000000..6a8454f4a96
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_newmake01.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cdt_w_newmake02.png b/doc/org.eclipse.cdt.doc.user/images/cdt_w_newmake02.png
new file mode 100644
index 00000000000..cd69d24c269
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cdt_w_newmake02.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cpp_bld_discovery_options.png b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_discovery_options.png
new file mode 100644
index 00000000000..0284f884679
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_discovery_options.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cpp_bld_environment.png b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_environment.png
new file mode 100644
index 00000000000..4c2efd61dce
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_environment.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cpp_bld_settings.png b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_settings.png
new file mode 100644
index 00000000000..80e6e971c5b
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_settings.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/cpp_bld_settings_tool.png b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_settings_tool.png
new file mode 100644
index 00000000000..02bc1ffa369
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/cpp_bld_settings_tool.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_configmulti.png b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_configmulti.png
new file mode 100644
index 00000000000..e5ae2b897a2
Binary files /dev/null and b/doc/org.eclipse.cdt.doc.user/images/new_proj_wz_configmulti.png differ
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm
index 21f73740255..93b87365854 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_brkpnts_watch.htm
@@ -10,9 +10,9 @@
 
 
 
-
      Working with breakpoints, watchpoints, and breakpoint actions
      
+
      Using breakpoints, watchpoints, and breakpoint actions
      
 
-
      This section explains how to work with Working with breakpoints, watchpoints, and breakpoint actions.
      
+
      The following topics explain how to use breakpoints, watchpoints, and breakpoint actions:
      
 
 			
      Adding breakpoints
      
 			  Adding watchpoints
      
@@ -21,7 +21,7 @@
 		      Enabling and disabling breakpoints and watchpoints
      
 		      Attaching or removing breakpoint actions
      
 
      
-			
      IBM Copyright Statement
      
+			
      QNX Copyright Statement
      
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
index 031cec6a41a..f55b8ce585a 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_build_task.htm
@@ -9,8 +9,8 @@
 
 
 
-
      Building projects
      
-
      This sections explains how to build your project and manage compile errors.
      
+
      Building projects and managing compile errors
      
+
      The following topics explain how to build a project, and to manage compile errors:
      
 	Renaming a project
      
 	Defining build settings
      
 	Filtering errors
      
@@ -28,7 +28,7 @@
 		Setting reminders
      
 
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_con_assist.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_con_assist.htm
index 9d312b0efaa..cd250fca7d6 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_con_assist.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_con_assist.htm
@@ -11,13 +11,13 @@
 
 
 
      Working with Content Assist
      
-
      This section provides information on code entry aids.
      
+
      The following topics provide information about code entry aids:
      
 		Using Content Assist
      
 		Creating and editing code templates
      
 		Importing and exporting code templates
      
 
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_debug.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_debug.htm
index 6e0c14ec21b..c7f7b63f794 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_debug.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_debug.htm
@@ -12,11 +12,11 @@
 
 
      Debugging
      
 
-
      This section explains how to debug your project.
      
+
      The following topics explain how to debug your project:
      
 
 		Debugging a program
      
 		Debugging an existing executable
      
-		Working with breakpoints and watchpoints
      
+		Using breakpoints and watchpoints
      
 			Adding breakpoints
      
 			Adding watchpoints
      
 			Removing breakpoints and watchpoints
      
@@ -28,7 +28,7 @@
 		Working with registers
      
 		Working with memory
      
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
index 05903bdb24b..5b0335903dd 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_proj_files.htm
@@ -11,17 +11,18 @@
 
 
 
      Working with C/C++ project files
      
-
      This section explains how to create and manage project files.
      
+
      The following topics explain how to create and manage project files:
      
 	Displaying C/C++ file components in the C/C++ Projects view
      
 	Converting a C or C++ nature for a project
      
 	Creating a C/C++ file
      
 	Creating a makefile
      
 	Hiding files by type in the C/C++ Projects view
      
 	Converting CDT 1.x Projects
      
-	Converting CDT 2.0 Managed Make Projects
      
+	Converting CDT Managed Make Projects
      
 	Adding Convert to a C/C++ Make Project to the New menu
      
+	Set Discovery Options
      
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm
index 320f6d43d39..0c289a2d212 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run.htm
@@ -11,7 +11,7 @@
 
 
 
      Running and debugging projects
      
-
      This section explains how to run a C or C++ application using an existing run configuration and how to create a new run configuration.
      
+
      The following topics explain how to run a C or C++ application using an existing run configuration, and how to create a new run configuration.
      
 	Creating or editing a run/debug configuration
      
 		Selecting a run or debug configuration
      
 		Creating a run or debug configuration
      
@@ -23,7 +23,7 @@
 		Specifying the location of the run configuration
      
 	Debugging
      
 		Debugging a program
      
-		Working with breakpoints and watchpoints
      
+		Using breakpoints and watchpoints
      
 			Adding breakpoints
      
 			Adding watchpoints
      
 			Removing breakpoints and watchpoints
      
@@ -36,7 +36,7 @@
 		Working with memory
      
 
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm
index f1e8fb1d3e9..9e20838771d 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_run_config.htm
@@ -12,18 +12,16 @@
 
 
      Creating or editing a run/debug configuration
      
 
      You can run an application by right-clicking the file and clicking Open 
-With > System Editor or you can create a run configure a run environment with 
+With > System Editor, or you can create a run configure a run environment with 
 which to run your application.
      
-
      This section explains how to create a run or debug configuration.
      
-
      The Run and Debug dialog boxes each contain the following tabs:
      
-
        
-  
      • Main
        • 
-  
      • Arguments
        • 
-  
      • Environment
        • 
-  
      • Debugger
        • 
-  
      • Source
        • 
-  
      • Common
        • 
-
      
+
+
      The Run and Debug pages of the configuration wizard contain the following tabs:
      
+
+
      Run and Debug tabs
      
+
+
      You will use these tabs to customize your run and debug configurations.
      
+
+
      The following topics explain how to create a run or debug configuration:
      
 		Selecting a run or debug configuration
      
 		Creating a run or debug configuration
      
 		Selecting an application to run or debug
      
@@ -33,11 +31,9 @@ which to run your application.
      
 		Specifying the location of source files
      
 		Specifying the location of the run configuration
      
 
-
-
  
      
 
-IBM Copyright Statement
+QNX Copyright Statement
 
 
 
\ No newline at end of file
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 55f60feb618..447fc0899e4 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
@@ -11,7 +11,7 @@
 
 
 
      Tasks
      
-
      Task topics provide step-by-step procedural instructions to help you perform required tasks.
      
+
      The following topics provide step-by-step procedural instructions to help you perform various activities with the CDT:
      
 
 Creating a project
      
 Working with C/C++ project files
      
@@ -33,12 +33,12 @@
 		Importing and exporting code templates
      
 	Shifting lines of code to the right or left
      
 	Navigating to C/C++ declarations
      
+	Navigating to C/C++ definitions
      
 	Refactoring
      
 Building projects
      
 	Renaming a project
      
 	Selecting referenced projects
      
-	Defining Standard Make build settings
      
-	Defining Managed Make build settings
      
+	Defining project build settings
      
 	Filtering errors
      
 	Selecting a binary parser
      
 	Adding Include paths and symbols
      
@@ -65,7 +65,7 @@
 		Specifying the location of the run configuration
      
 	Debugging
      
 		Debugging a program
      
-		Working with breakpoints and watchpoints
      
+		Using breakpoints and watchpoints
      
 			Adding breakpoints
      
 			Adding watchpoints
      
 			Removing breakpoints and watchpoints
      
@@ -83,7 +83,7 @@
 	C/C++ Indexer - Indexer Timeout
      
 	Setting Source Folders
      
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm
index e467416078e..4f7fe7e7e24 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_tasksview.htm
@@ -12,13 +12,13 @@
 
 
      Viewing and managing compile errors
      
 
-
      This section describes how to view and manage compile errors. Compile errors are displayed in the console view.
      
+
      The following topics describe how to view and manage compile errors. The CDT displays compile errors in the Console view.
      
 		Jumping to errors
      
 		Filtering the Tasks view
      
 		Setting reminders
      
 
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm
index 583c1d22823..81cac5f3477 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_o_write_code.htm
@@ -11,7 +11,7 @@
 
 
 
      Writing code
      
-
      This sections explains how to work with the C/C++ editor.
      
+
      The following topics explain how to work with the C/C++ editor:
      
 	Customizing the C/C++ editor
      
 	Commenting out code
      
 	Working with Content Assist
      
@@ -22,9 +22,10 @@
 	Searching for C/C++ elements
      
 	Selection Searching for C/C++ elements
      
 	Navigating to C/C++ declarations
      
+	Navigating to C/C++ definitions
      
 	Refactoring
      
 
-
      IBM Copyright Statement
      
+
      QNX Copyright Statement
      
 
 
 
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
index 628689004b7..08ad7f3219d 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_brk_action.htm
@@ -15,9 +15,9 @@
 
      To add a new breakpoint action:
      
 
        
   
      1. Click Window > Preferences.
        2. 
-  
      2. Expand C/C++ > Debug and click Breakpoint Actions.
        3. 
-  
      3. In the Breakpoint Actions page, click New. 
        
-    
        
+  
      4. Expand C/C++ > Debug and click Breakpoint Actions.


        5. 
+  
      5. In the Breakpoint Actions page, click New. 

        
+    
        
   
        6. 
   
      6. In the New Breakpoint Action dialog box, type a name for the action in the Action name box.
        7. 
   
      7. Select an action  from the Action type list. 
        8. 
@@ -41,7 +41,7 @@
 
        
 Debug preferences
        
 
        
-Nokia Copyright Statement
+Nokia Copyright Statement
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
index f84f7ede30f..50522d3ad6d 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_codetemp.htm
@@ -11,47 +11,47 @@
 
 
 
        Creating and editing code templates
        
-
        Content Assist uses code templates enable you to use commonly used code snippets quickly.  
        
+
        Content Assist uses code templates to enable you to quickly make use of commonly used code segments.  
        
 
        To create a code template:
        
 
 
          
   
        1. Click Window > Preferences.
          2. 
-  
        2. Expand C/C++, and click Code Templates.
          3. 
-  
        3. Click New.
          
-  Creating a new Code Template Window
-
+  
        4. Expand C/C++, expand Content Assist and select Templates.
          5. 
+  
        5. Click New.

          
+  Creating a new Code Template Window
          
+
          
   
          6. 
   
        6. Do the following: (if required)
          
 	
            
-  		
          • In the Name field, enter a template name.
            • 
-  		
          • Select  Structure, Global or Function for either C or C++ from the Context drop down list.
            • 
-  		
          • In the Description field, enter a description for your new code template.
            • 
-  		
          • In the Pattern field, enter the code for your template.
            • 
-  		
          • Click Insert Variable to add a variable from the list to the code you have entered in the Pattern box.
            • 
+  		
          • In the Name field, type a template name.
            • 
+  		
          • In the Context drop down list, select the context type for the new template; either  C/C++ or a Comment.
            • 
+  		
          • In the Description field, type a description for the new code template.
            • 
+  		
          • In the Pattern field, type the code for this template.
            • 
+  		
          • Click Insert Variable to add a variable from the list to the code you have entered in the Pattern field.
            • 
 	
          
  
          7. 
  
        7. Click OK.
          
- The new code template is now displayed in the list.
          8. 
+ The new code template displays in the Templates list. 
 
        
 
 
        To edit a code template:
        
 
 
          
   
        1. Click Window > Preferences.
          2. 
-  
        2. Expand C/C++, and click Code Templates.
          3. 
-  
        3. Click Edit. The New Template dialog box opens.
          
-  Editing a Code Template
-  
          4. 
+  
        4. Expand C/C++, expand Content Assist and select Templates.
          5. 
+  
        5. Click Edit. The Edit Template dialog opens.

          
+  Editing a Code Template
          
+  
          6. 
   
        6. Do the following:
          
 	
            
   		
          • In the Name field, change the template name to create a new 
         template based on the current template. 
            • 
-  		
          • Select  Structure, Global or Function for either C or C++ from the Context drop down list to select where the template will appear.
            • 
+  		
          • In the Context drop down list, select the context type for the new template; either  C/C++ or a Comment.
            • 
   		
          • In the Description field, change the description of the code 
         template to reflect your changes.
            • 
   		
          • In the Pattern field, edit the code.
            • 
   		
          • Click Insert Variable to add a variable from the list to the 
-        code you have edited in the Pattern box.
            • 
+        code you edited in the Pattern field.
 	
          
  
          7. 
  
        7. Click OK.
          8. 
@@ -68,7 +68,7 @@
 Code Templates page, Preferences window
          
 Code Templates page
          
 
          
-IBM Copyright Statement
+QNX Copyright Statement
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm
index 1e9b3dc4f7c..c7201377994 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_add_watch.htm
@@ -16,19 +16,17 @@
 
 
          A watchpoint is a special breakpoint that stops the execution of an 
 application whenever the value of a given expression changes, without specifying 
-where this may happen. Unlike breakpoints which are line-specific watchpoints 
+where it might occur. Unlike breakpoints (which are line-specific), watchpoints 
 are associated with files. They take effect whenever a specified condition is 
-true regardless of when or where it occurred.
-To set a watchpoint on a global variable highlight the variable in the editor or 
-select it in the outline view. 
          
+true, regardless of when or where it occurred. You can set a watchpoint on a global variable by highlighting the variable in the editor, or by selecting it in the Outline view. 
          
 
 
          To set a watchpoint on a global variable:
          
 
 
            
-  
          1. Highlight the variable in the editor or select it in the outline view.
            2. 
+  
          2. Highlight the variable in the editor, or select it in the Outline view.
            3. 
   
          3. Click Run > Toggle Watchpoint.
            4. 
   
          4. Do any of the following:
            5. 
-  
            • To stop execution when  the watch expression is read, select the
+  
              • To stop execution when the watch expression is read, select the
   Read check box.
                • 
   
              • To stop execution when  the watch expression is written to, select the Write 
   check box.
              
@@ -41,12 +39,12 @@ select it in the outline view. 
              
 C/C++ Development perspective
              
 
              Related tasks
 
              
-Working with breakpoints and watchpoints
              
+Using breakpoints and watchpoints
              
 
              Related reference
 
              
 Run and Debug dialog box
              
 
-IBM Copyright Statement
+QNX Copyright Statement
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
index 5808c726f7d..6dbab999513 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_addmaketarget.htm
@@ -10,12 +10,12 @@
 
 
 
-
              Creating a Make Target
              
+
              Creating a make target
              
 
+
              
 
              To create a make target:
              
 
                
-  
              1. Right click on the project and select Create Make Target...

                2. 
-  Select Create Make Target
                 
+  
              2. Right click on a project and select Make Target > Create.
                3. 
   
              3. Enter the Target name and build options and click Create.
                
   Create Make Target Window
                 
                4. 
   
              4. The make target will appear in the Make Targets view.
                
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm
index 6de0ee72daf..ee13c1ff944 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_discovery.htm
@@ -8,49 +8,39 @@
 
 
 
                Set Discovery Options
                
-
                For most standard make projects you will want to parse the output of
+
                For most make projects, you will want to parse the output of
 the build to populate your paths and symbols tables. 
                
-
                To do so right click on your project and select Properties >
-C/C++ Build > Discovery Options 
-and select the Automate discovery of paths and symbols checkbox.
                
-
                
-
                There are two discovery profiles available:
                
-
                
-
                  
-  
                • Per project - all discovered paths and symbols are associated
-with the project; all files use this information. 
                  
-  
                  • 
-
                
-
                C/C++ Project Properties, Standard, Discovery Options
                
-
                
-
                  
-  
                • Per file - specific discovered paths and symbols are associated
-with a file or set of files they apply to. Header files that do not
-inherit information from a source file that includes it will use
-project level information. Source files that have not been compiled at
-all will have no information associated (high level CDT functionality
-will be limited for these files).
                  
-    
                  
-Use per file profile to improve CDT features correctness.
                  
-    
                  
-  
                  • 
-
                
+
                To do so:
                
+
                  
+	
                1. Right-click on a project and select Properties.
+	
                2. Expand C/C++ Build and select Discovery Options.
+	
                3. Select the Automate discovery of paths and symbols option so that it is enabled.
+	
                4. For the scanner configuration on the Discovery Options page of the C/C++ Properties window, you have the following options:
+
+
                  There are currently three discovery profiles available on a Per project basis - all discovered paths and symbols are associated with the project; all files use this information. 
                  
+
+
                  
+  
                  Enable generate scanner info command
                  
+  
                  Enables the retrieval of information from the scanner.
                  
+  
                  
 
                  
 
                  C/C++ Properties, Discovery Options
                  
+ alt="C/C++ Project Properties, Standard, Discovery Options"
+ src="../images/sprop_make_discovery_file.png"
+ style="width: 598px; height: 585px;">
                  
 
                  
 
                  For both profiles there is an option to discover paths and symbols
 based on a previous build output. To activate the discovery select a
 build log file and then the Load
 button.
                  
 
                  
+
                
+
                
 
                Related reference
                
 Converting CDT 1.x Projects
                
-C/C++ Properties, Discovery Options
                
-IBM Copyright Statement
+C/C++ Project
+Properties, Discovery Options
                
+QNX Copyright Statement
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm
index 74f8f0d23ce..37711a72676 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_error_parser.htm
@@ -20,18 +20,30 @@ the build output log.
                
 
                If an error or warning is detected, an icon appears on the file in the Tasks 
 view. If the file is not found, the icon appears on the project.
                
 
-
                You can define the properties on a per project basis in the New Project 
-wizard, in the C/C++ Projects view or in the Project Explorer view. You can also define 
-project properties in the Preferences window for future standard make projects.
                
+
                You can define the properties on a per project basis in the New CDT Project 
+wizard, in the C/C++ Projects view, or in the Navigator view. You can also define 
+project properties in the Preferences window for future make projects.
                
 
 
                To select error parsers:
                
 
 
                  
   
                1. Do one of the following:
                  2. 
   
                    
-  	  
                  • To set properties for future Standard Make projects, click Window > Preferences . ExpandC/C++, and click New Make Projects.
                    • 
-	  
                  • For a Standard Make project, in the C/C++ Projects view, right-click the project, and select Properties.  Select C/C++ Make Project from the list.
                    • 
-	  
                  • For a Managed Make project, in the C/C++ Projects view, right-click the project, and select Properties.  Select C/C++ Build from the list.
                    • 
+ 	
                
+  	  
              5. To set properties for makefile projects, do the following:
+		
                  
+		
                1. Select Window > Preferences . 
+		
                2. Expand C/C++.
+		
                3. Expand New CDT project wizard.
+		
                4. Click Makefile Project.
                  5. 
+		
                
+	  
              6. For a typical make project, do the following:
+		
                  
+			
                1. In the C/C++ Projects view, right-click the project, and select Properties.  
+			
                2. Expand C/C++ Build.
                  3. 
+	  
                3. Select Settings.  
+	
                
+
                7. 
   
            
   
          5. Click the Error Parsers tab.
            6. 
   
          6. In the Error parsers list, select error parsers.
            7. 
@@ -48,7 +60,7 @@ project properties in the Preferences window for future standard make projects.<
 Error Parsers, C/C++ Properties window
            
 
 
-IBM Copyright Statement
+QNX Copyright Statement
 
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm
index 20e530291af..685f4bdfec3 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_paths.htm
@@ -5,46 +5,44 @@
   
   Adding Include paths and symbols
   
+
 
 
 
            Adding Include paths and symbols
            
-
            For CDT projects 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. 
            
+
            For CDT projects, you can define include paths and
+preprocessor symbols for the parser. This lets the parser understand the contents of the C/C++ source code so that you can more effectively use the search and code completion features. 
            
 
-
            If Autodiscovery is enabled once a build has completed any
-discovered paths and symbols will be displayed in the Discoverd Paths
+
            If Autodiscovery is enabled, after a build finishes, any
+discovered paths and symbols will be displayed in the Discoverd Paths
 section. You can also define the properties on a per project basis in
-the C/C++ Projects or Project Explorer views.
            
+the C/C++ Projects or Navigator views.
            
 
            To add include paths and symbols:
            
-
              
-  
            • To set properties for your project right click your CDT
+
                
+  
              1. To set properties for your project, right-click your CDT
 project and select Properties. Alternatively, to set properties
-for a specific source file in your project right click a source file
-within your standard make project and select Properties. 
                2. 
-  
              2. Click C/C++ Include Paths and Symbols.
                
-    Paths and Symbols Property Window - Symbols Tab
- 
                
- 
                
-    Paths and Symbols Property Window - Includes Tab
                
- 
                3. 
-  
              3. Use "Add" button to define new element (Include Path, Symbol, Library path etc).
+  
              4. Expand C/C++ General and select Paths and Symbols.
+ 

                Click here to see an illustration (displayed in a separate window).

                
+
                5. 
+  
              5. Click Add to define new element (Include Path, Symbol, Library path etc).
   
                6. 
-  
              6. Use "Edit" button to change selected element (Include Path, Symbol, Library path etc).
+  
              7. Click Edit to change selected element (Include Path, Symbol, Library path etc).
   
                8. 
-  
              8. Use "Delete" button to remove selected element (Include Path, Symbol, Library path etc).
+  
              9. Click Delete to remove selected element (Include Path, Symbol, Library path etc).
   
                10. 
-  
              10. Use "Export" button to make selected element (Include Path, Symbol, Library path etc) exported.
+  
              11. Click Export to make selected element (Include Path, Symbol, Library path etc) exported.
   
                12. 
-  
              12. Use "Unexport" button to remove selected element (Include Path, Symbol, Library path etc) from export list.
+  
              13. Click Unexport to remove selected element (Include Path, Symbol, Library path etc) from export list.
   
                14. 
-  
              14. Use "Move up" and "Move down" buttons to set elements (Include Paths, Library paths etc) order.
+  
              15. Click Move up and Move down to set elements (Include Paths, Library paths etc) order.
   
                16. 
-
            
+
          
 
          Related concepts
          
 CDT Projects
          
@@ -52,6 +50,6 @@ within your standard make project and select Related tasks
          
 Working with C/C++ project files
          
-IBM Copyright Statement
+QNX Copyright Statement
 
 
diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm
index 70fb77b87f5..58ceceda58f 100644
--- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm
+++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_proj_rename.htm
@@ -23,14 +23,14 @@
   Project Properties menu highlighting Rename
   
           
   
          
-  
        8. Editbox will be activated just on the project name. Type a new name.
+  
        9. The edit box is activated for the selected project. Type a new name.
   
          10. 
   
        10. Press Enter.
          11. 
 
        
 
 
        Note: 
 Renaming a project causes it to be re-indexed. 
-This can take a significant amount of time for very large projects.
+This can take a significant amount of time for very large projects. The new name must be unique within the  workspace.
 
        
 
   
        Related concepts
@@ -45,7 +45,7 @@ This can take a significant amount of time for very large projects.
 Project properties
        
 
 
-IBM Copyright Statement
+QNX Copyright Statement
 
 
 
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 7cb282d89eb..588ef7e9c36 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
@@ -4,9 +4,7 @@
 
 
           
-          
-          
-          
+