Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Daoust2004-12-02 18:53:18 +0000
committerDavid Daoust2004-12-02 18:53:18 +0000
commit198c40a7950f0a0b7b21b08460cd1bd4b8f0162f (patch)
treedcb6fe1b957cfb7d66bce6d5f8f4446b180eeb1f /doc/org.eclipse.cdt.doc.user
parentd89f346613c62a217ace5c7131d32e63ed7caf47 (diff)
downloadorg.eclipse.cdt-198c40a7950f0a0b7b21b08460cd1bd4b8f0162f.tar.gz
org.eclipse.cdt-198c40a7950f0a0b7b21b08460cd1bd4b8f0162f.tar.xz
org.eclipse.cdt-198c40a7950f0a0b7b21b08460cd1bd4b8f0162f.zip
From Leo: This patch contains minor edits for the MBS user documentation for 2.1 & Head.
Diffstat (limited to 'doc/org.eclipse.cdt.doc.user')
-rw-r--r--doc/org.eclipse.cdt.doc.user/concepts/cdt_o_build_conc.htm2
-rw-r--r--doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm2
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_build.htm2
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_mfile_tool_settings.htm2
-rw-r--r--doc/org.eclipse.cdt.doc.user/reference/cdt_u_mprop_merror.htm2
-rw-r--r--doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_cdt_proj.htm4
-rw-r--r--doc/org.eclipse.cdt.doc.user/tasks/cdt_t_convert_mbs20_proj.htm2
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 @@
<p>This section describes the build views and terminology.</p>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_c_build_over.htm">Building C/C++ Projects</a><br>
-<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Manage Build Extensibility Document</a><br>
+<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build_21/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Manage Build Extensibility Document</a><br>
<p><img src="../images/ng00_04a.gif" ALT="IBM Copyright Statement" ></p>
diff --git a/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm b/doc/org.eclipse.cdt.doc.user/concepts/cdt_o_concepts.htm
index 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 @@
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_build_conc.htm">Build</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_build_over.htm">Building C/C++ Projects</a><br>
- <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Manage Build Extensibility Document</a><br>
+ <img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build_21/Managed_Build_Extensibility.html?cvsroot=Tools_Project">Manage Build Extensibility Document</a><br>
<img src="../images/trans.gif" border="0" width="25" height="1" alt=""><a style="text-decoration:none" href="cdt_o_dbg_concepts.htm">Debug</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_brkpnts.htm">Breakpoints</a><br>
<img src="../images/trans.gif" border="0" width="50" height="1" alt=""><a style="text-decoration:none" href="cdt_c_over_dbg.htm">Debug overview</a><br>
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.<p><i
selected build configuration.</dd>
<dt>Configuration:</dt><dd>Select the build configuration from the list provided.</dd>
<dt>Resource Configuration settings</dt><dd>Edit individual file options.</dd>
- <dt>Restore Defaults</dt><dd>Returns any changes back to the setting of the selected configuration.</dd>
+ <dt>Restore Defaults</dt><dd>Returns any changes back to the settings of the selected configuration.</dd>
<dt>Apply</dt><dd>Applies any changes.</dd>
</dl></p>
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.</dd>
<dt>Configuration:</dt><dd>Select the build configuration from the list provided.</dd>
<dt>Resource Configuration settings, Tool Settings</dt><dd>Edit individual tool options for the selected file.</dd>
- <dt>Restore Defaults</dt><dd>Returns any changes back to the setting of the selected configuration.</dd>
+ <dt>Restore Defaults</dt><dd>Returns any changes back to the settings of the selected configuration.</dd>
<dt>Apply</dt><dd>Applies any changes.</dd>
</dl></p>
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 @@
<body>
<h1>C/C++ Project Properties, Managed, C/C++ Build, Error Parsers</h1>
-<p>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.</p>
+<p>Customizes the list of the filters that detect error patterns in the build output log.</p>
<p><img img src="../images/mprop_errorp.png" alt="C/C++ Project Properties, Managed, Error Parser"></p>
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 @@
<p>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 <b>Convert to C/C++ Make Project Wizard below.</b></p>
+Make project, see <b>Convert to C/C++ Make Project Wizard</b> below.</p>
<h2>Updating a Managed Make Project </h2>
<p>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.&nbsp; You will be prompted to update the project.</p>
+information and discovers that the project needs to be updated.&nbsp; You will be prompted to update the project.</p>
<p> <img src="../images/update_managed_build.png" alt="Update Managed Builder dialog box"></p>
<p>Click <b>Yes</b> and the project will be updated.&nbsp; The updated Managed
Build information can no longer be loaded by CDT 1.x or CDT 2.0.&nbsp; Select <b>
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 @@
<p>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.&nbsp; You will be prompted to update the project.</p>
+information and discovers that the project needs to be updated.&nbsp; You will be prompted to update the project.</p>
<p> <img src="../images/update_managed_build20.png" alt="Update CDT 2.0 Managed Builder dialog box"></p>
<p>Click <b>Yes</b> and the project will be updated.&nbsp; The updated Managed
Build information can no longer be loaded by CDT 2.0.&nbsp; Select <b>

Back to the top