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 83b080e984c..58b9ef26a43 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 @@ -9,68 +9,71 @@

Before you begin

-

Depending on how you received the CDT you may or may not have also received +

Depending on how you obtained the CDT, you might have also received a tool chain with a built-in CDT integration. -If you simply downloaded the CDT from an update site, then one will be required before -you can build and debug projects.

+However, if you downloaded the CDT from an update site, then you will require a tool chain before +you can build and debug any projects.

The base CDT supports integration with the GNU tool chain. This includes GNU's make, gcc compiler, and gdb debugger utilities. If you require a tool chain to build software for your development host, this is the best choice to get started. -Each platform that runs the CDT requires different steps to acquire this tool chain.

+ +

Each platform that runs the CDT requires different steps to acquire this tool chain.

Linux

All Linux distributions include the GNU tool chain. They may not, however, be installed by default. -Please see the instructions for your particular distribution on how to install it

+For instructions about installing the GNU tool chain for Linux, see the instructions for your particular distribution.

Windows

-

There are two main choices for acquiring the GNU tool chain for Windows: MinGW, and Cygwin.

- -

Cygwin is a port of the Linux environment to Windows. +

For windows, MinGW, and Cygwin are the two main choices for acquiring the GNU tool chain:

+ +

Other Platforms

-

The GNU tool chain is supported on all platforms that the CDT supports. -Please see you're platform vendor for instructions on how to install the GNU tool chain -on your platform.

+

The GNU tool chain is supported on all platforms that the CDT supports. For instructions about installing the GNU tool chain +on your platform, see your platform vendor.

Related reference
CDT Home
@@ -78,7 +81,7 @@ on your platform.

Related tasks
Building Manually

-

IBM Copyright Statement +

QNX Copyright Statement

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 a53e61613b5..ee1e9c76a78 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 @@ -46,13 +46,13 @@ at any time for existing project. Use an existing C/C++ project +
  • an existing C/C++ project +
    • + +
  • existing C/C++ code that isn't part of a project
  • - existing C/C++ code that isn't part - of a project -
    • - -
  • - existing C/C++ code that needs - to be added to an existing project + existing C/C++ code that needs to be added to an existing project
    • -

    Importing a C/C++ project from CVS

    +

    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.

    -

    Importing C/C++ code from CVS

    +

    Importing C/C++ code from CVS

    To check out existing C/C++ code that is not part of a project: @@ -74,11 +70,7 @@ To check out existing C/C++ code that is not part of a project: The Check Out As wizard dispalys.

    -
    - Check Out As - The Check Out As wizard. -
    - +
  • Choose how to check out this project: @@ -103,7 +95,7 @@ To check out existing C/C++ code that is not part of a project:
  • as a Standard Make C/C++ Project – if you need to create your own - Makefile to integrate with an existing build + Makefile to integrate with an existing build process
    • @@ -111,13 +103,13 @@ To check out existing C/C++ code that is not part of a project:

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

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

  • Click Next to continue. -

    Importing C/C++ code into an existing project

    +

    Importing C/C++ code into an existing project

    To import a directory full of C/C++ code into an existing project: @@ -185,7 +177,7 @@ recreate it specifying a different non-default location.

    Another approach would be to create a C/C++ Project and then import your existing file system. -For more information, see Workbench User Guide > Tasks > Importing > +For more information about importing, see Workbench User Guide > Tasks > Importing > Importing resources from the file system.

    This approach copies the files from your file system to an Eclipse Workbench 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 cbb09f25d75..56b682bfb41 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 @@ -37,13 +37,13 @@ that can incrementally compile source files as they are changed.

    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 +
  • 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 +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 +
  • 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.