diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm
index ae86442085a..7152daf9c57 100644
--- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm
+++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_c_before_you_begin.htm
@@ -57,7 +57,7 @@ MinGW File Release section for the latest versions.
Select download and install the MinGW base tools and the g++ compiler.
You may select the Current or Candidate version of these tools.
You may also install any of the other available compilers as well.
-
Do not install the MinGW Make feature as the MSYS version of make from step 3
+
Do not install the MinGW Make feature as the MSYS version of make from step 5
is a more complete implementation of make.
The MinGW setup program currently does not install the gdb debugger.
To install the debugger, download the file from the following location:
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 5e2ec1e052f..7914bc4981a 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
@@ -35,7 +35,7 @@ With CDT 4.0, you now select a project type, and that determines what build syst
Click here to see an illustration.
By default, the CDT filters the Toolchain and Project types that it displays in those lists based on the language support for the C++ Project wizard you selected for this tutorial.
-
In the Project name field, type a name for the project.
+
In the Project name field, type a name for the project, such as Hello World.
From the Project types list, expand Executable and select Hello World C++ Project. This project type provides a simple Hello World application in C++, and the makefile is automatically created by the CDT.
@@ -67,63 +67,46 @@ With CDT 4.0, you now select a project type, and that determines what build syst
A project is created with the default settings and a full set of configurations based on the project type and toolchain you selected.
You should now see the new project in C/C++ Projects view.
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.
-
+
Step 2: Reviewing the code and building the project
-
Right-click on your project in the Navigator.
-
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
-
-
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.
-
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.
-
Save the main.cpp file by clicking File > Save or pressing CTRL+S.
-
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
+
From the Project Explorer in the C++ Projects View, double-click the .cpp file that was created for your project, for example, Hello World.cpp.
+
This file opens in a default editor. It contains C++ template code for the Hello World example project you selected earlier.
+
+
Note: You can specify a different editor, and add or modify existing code templates in Window > Preferences.
In addition, the Outline view has also been populated
+with objects created from your code.
Optional: You can type additional code in this file, and then save the changes by clicking File > Save, or pressing CTRL+S.
+
+
Next, you will need to build your project before you can run it.
+
Build your project by pressing CTRL+B, or select the project from the Project Explorer tab in the C++ Projects view and select File > Build Project.
+
Note: If a build generates any errors or warnings, you can see those in the Problems view. If you encounter difficulty, see the topics Building C/C++ projects and Before you begin .
+
Read through the build messages in the Console view.
+The project should build successfully.
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.
+with objects created from your code. If you select an item from the Outline view, the
+corresponding text in the editor is highlighted.
-
Step 4: Running the application
+
Step 3: Running the application
+
+
To run your application:
-
To run your application within the C/C++ Perspective, click Run > Run...
-
Select C/C++ Local Application.
-
Click 'New'.
-
Click 'New'.
+
Within the C/C++ Perspective, click Run > Run.
+
Select C/C++ Local Application.
+
Click New.
-
A new Run Configuration is created. Its name and path to executable are provided by the project ('HelloWorld' in our case).
+
A new Run Configuration is created. Its name and path to the executable are provided by the project ('Hello World' in our case).
-
Click 'Run'.
-
+
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.
-
-
Type in your name and press Enter.
-
The title bar in the Console view shows you when the program has terminated.
+
Now, you should see the Hello World application running in the Console view.
+The Console also shows which application is running in a title bar.
You can click the other views to see the information that they contain.
The make output and build progress information displays in the
-Console view. The Make Targets view displays makefile actions. The
+Console view. The Make Targets view displays makefile actions, and the
Tasks view displays compile warnings or errors.
To build a project:
-
In the C/C++ Projects view, select your project. For the tutorial, you want to select the HelloWorld project.
+
In the C/C++ Projects view, select your project. For the tutorial, you can to select the Hello World project you created earlier.
Click Project > Build Project.
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
installed on your system.
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 31ed4a873f9..da6b8908c5b 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
@@ -106,7 +106,7 @@ To check out existing C/C++ code that is not part of a project:
Click Finish to exit the Check Out As dialog.
-
Click Next to continue.
+
Click Next to continue.
Importing C/C++ code into an existing project
@@ -118,25 +118,22 @@ To import a directory full of C/C++ code into an existing project:
Right-click the module or directory in the CVS
- Repositories view and choose Check Out As…
+ Repositories view and choose Check Out As
from the menu.
The IDE displays the Check Out As dialog.
-
Choose Check out into an existing project, and then click
- Next.
+
Choose Check out into an existing project, and then click
+ Next.
The IDE displays the Check Out Into dialog:
-
-
-
Select an existing project from the list, and then
- click Finish to add the code from CVS to the selected
+ click Finish to add the code from CVS to the selected
project.
@@ -149,7 +146,7 @@ If your resource code is not managed in CVS but is available from the file syste
Identify a "root folder" of your source code tree.
Create a new C/C++ project using the New Project Wizard, and specify the "root folder" as a non-default location of the new project.
-
Typically existing projects will have their own makefiles, so you should create a new Standard Make C/C++ project. For more information see
+
In the Project name field, type a name for the project.
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.
-
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.
+
In the Location field, specify a path for your project.
From the Project types list, expand Makefile Project and select Hello World C++ Project.
Click Next.
Select only the configurations you want created. Configurations display for each toolchain selected on the previous page of the wizard.
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 72b922e3a8a..81dc2a2b929 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
@@ -29,52 +29,46 @@ function newWin(url) {
To obtain the latest CDT features:
-
Select Help > Software Updates > Find and Install.
+
Select Help > Software Updates > Find and Install.
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.
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, and then follow the steps to update using that method.
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
-
-
Expand and select any additional features that you require. De-select any options that do not apply to you.
-
Click Next.
+
The Search Results dialog shows the features available to install from the update site. Expand and select any additional features that you require. De-select any options that do not apply to you.
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.
+
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.
You can review the summary list of the features you selected to install.
-
Optional: Click Change Location to select the location you would like the updates installed. Typically, this is the directory where you installed Eclipse.
-
You can review the summary list of the features you selected to install.
+
Optional: Click Change Location to select the location you would like the updates installed. Typically, this is the directory where you installed Eclipse.
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.
You can select toolchain(s) from this page of the wizard.
+
You can select toolchain(s) from this page of the wizard. 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 project type you specify, and the compilers installed on your system.
+
@@ -24,9 +27,9 @@
Show Project Types and toolchains only if they are supported on the platform
-
If checked (default), list is filtered so that only toolchains
+
When selected (default), the list is filtered so that only toolchains
that are buildable on the host system are shown.
- If unchecked, lists all known toolchains.
+ If it is not selected, the list displays all known toolchains.
You can select the type of project from this page of the wizard.
+
You can select a type of project from this page of the wizard. This project type will determine the toolchain and data, and tabs that the CDT uses. Once created, C/C++ projects display in the C/C++ Projects view.
@@ -35,7 +35,7 @@ types that are buildable on the host system are shown.