From 198c40a7950f0a0b7b21b08460cd1bd4b8f0162f Mon Sep 17 00:00:00 2001 From: David Daoust Date: Thu, 2 Dec 2004 18:53:18 +0000 Subject: [PATCH] From Leo: This patch contains minor edits for the MBS user documentation for 2.1 & Head. --- doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm | 2 +- doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm | 2 +- doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm | 2 +- .../reference/cdt_u_mfile_tool_settings.htm | 2 +- doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm | 2 +- doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm | 4 ++-- .../tasks/cdt_t_convert_mbs20_proj.htm | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm index 51bd95f3aa4..060013e61cb 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm @@ -14,7 +14,7 @@

This section describes the build views and terminology.

Building C/C++ Projects
-Manage Build Extensibility Document
+Manage Build Extensibility Document

IBM Copyright Statement

diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm index 8fc274e60ec..fbc1150c8d0 100644 --- a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm +++ b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm @@ -38,7 +38,7 @@ Build
Building C/C++ Projects
- Manage Build Extensibility Document
+ Manage Build Extensibility Document
Debug
Breakpoints
Debug overview
diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm index 36667b8b9a5..ad7a65447a7 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm @@ -18,7 +18,7 @@ Resource Configuration settings area to set a specific category of options.

Configuration:
Select the build configuration from the list provided.
Resource Configuration settings
Edit individual file options.
-
Restore Defaults
Returns any changes back to the setting of the selected configuration.
+
Restore Defaults
Returns any changes back to the settings of the selected configuration.
Apply
Applies any changes.

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm index 192ec5f5497..32beb1fc3a6 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm @@ -18,7 +18,7 @@ Customizes the tools and tool options used by the selected file in your build co selected build configuration.
Configuration:
Select the build configuration from the list provided.
Resource Configuration settings, Tool Settings
Edit individual tool options for the selected file.
-
Restore Defaults
Returns any changes back to the setting of the selected configuration.
+
Restore Defaults
Returns any changes back to the settings of the selected configuration.
Apply
Applies any changes.

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm index 013af75bfa4..8a1f6798924 100644 --- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm +++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm @@ -10,7 +10,7 @@

C/C++ Project Properties, Managed, C/C++ Build, Error Parsers

-

You can view a list of the filters that detect error patterns in the build output log, on the Error Parsers page of a C/C++ project's properties window.

+

Customizes the list of the filters that detect error patterns in the build output log.

C/C++ Project Properties, Managed, Error Parser

diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm index 176a07e1de5..35748909110 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm @@ -14,12 +14,12 @@

How you update your CDT 1.x project to CDT 2.1 depends upon whether the project is a Standard Make project or a Managed Make project. For a Standard -Make project, see Convert to C/C++ Make Project Wizard below.

+Make project, see Convert to C/C++ Make Project Wizard below.

Updating a Managed Make Project

For a Managed Make project, the Managed Build system will prompt you to convert your project when it attempts to read the Managed Build project -information and discovers that project needs to be updated.  You will be prompted to update the project.

+information and discovers that the project needs to be updated.  You will be prompted to update the project.

Update Managed Builder dialog box

Click Yes and the project will be updated.  The updated Managed Build information can no longer be loaded by CDT 1.x or CDT 2.0.  Select diff --git a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm index c3d49aa60e0..c46979c7527 100644 --- a/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm +++ b/doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm @@ -14,7 +14,7 @@

For a CDT 2.0 Managed Make project, the Managed Build system will prompt you to convert your project when it attempts to read the Managed Build project -information and discovers that project needs to be updated.  You will be prompted to update the project.

+information and discovers that the project needs to be updated.  You will be prompted to update the project.

Update CDT 2.0 Managed Builder dialog box

Click Yes and the project will be updated.  The updated Managed Build information can no longer be loaded by CDT 2.0.  Select