From 9311234a35b4e339e8558233856b8f9695744821 Mon Sep 17 00:00:00 2001
From: David Daoust <dave.daoust@windriver.com>
Date: Wed, 2 Jun 2004 20:56:38 +0000
Subject: [PATCH] From Dave Williams: 1 file in the reference section failed
 checkpii and there was a link error in the .xml files.

---
 .../reference/cdt_u_sprop_mdiscovery.htm      |  4 +-
 .../topics_Concepts.xml                       | 44 +++++++++----------
 .../topics_Reference.xml                      |  2 +-
 doc/org.eclipse.cdt.doc.user/topics_Tasks.xml |  2 +-
 4 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm
index c549a1640b5..4bb56f549d3 100644
--- a/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm
+++ b/doc/org.eclipse.cdt.doc.user/reference/cdt_u_sprop_mdiscovery.htm
@@ -19,7 +19,7 @@
 <dl>
 	<dt>Automate scanner configuration discovery</dt>
 	<dd>Select this checkbox to configure the scanner discovery to run automatically.</dd>
-	<dt>Build output parser options<</dt>
+	<dt>Build output parser options</dt>
 	<dd>This section allows you to select the output parser.</dd>
 	<dt>Generate scanner info command options</dt>
 	<dd>This section allows you to select the scanner info settings.</dd>
@@ -61,4 +61,4 @@
 
 </body>
 
-</html>
+</html>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
index 0df87d08822..ba14bebddac 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
@@ -3,31 +3,31 @@
 <!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
 
 <toc label="Concepts">
-	<topic label="CDT Overview" href="cdt_c_over_cdt.htm"/> 
-	<topic label="CDT Projects" href="cdt_c_projects.htm"/> 
-	<topic label="CDT Perspectives" href="cdt_c_perspectives.htm"/> 
-	<topic label="CDT Views" href="cdt_c_views.htm"/> 
-	<topic label="Code aids" href="cdt_o_code_entry.htm">
-		<topic label="Comments" href="cdt_c_comments.htm"/>
-		<topic label="Content Assist" href="cdt_c_content_assist.htm"/>
-		<topic label="Templates" href="cdt_c_templates.htm"/> 
+	<topic label="CDT Overview" href="concepts/cdt_c_over_cdt.htm"/> 
+	<topic label="CDT Projects" href="concepts/cdt_c_projects.htm"/> 
+	<topic label="CDT Perspectives" href="concepts/cdt_c_perspectives.htm"/> 
+	<topic label="CDT Views" href="concepts/cdt_c_views.htm"/> 
+	<topic label="Code aids" href="concepts/cdt_o_code_entry.htm">
+		<topic label="Comments" href="concepts/cdt_c_comments.htm"/>
+		<topic label="Content Assist" href="concepts/cdt_c_content_assist.htm"/>
+		<topic label="Templates" href="concepts/cdt_c_templates.htm"/> 
 	</topic>
-	<topic label="Editing" href="cdt_o_edit.htm"> 
-		<topic label="Editor View" href="cdt_c_editor.htm"/>
+	<topic label="Editing" href="concepts/cdt_o_edit.htm"> 
+		<topic label="Editor View" href="concepts/cdt_c_editor.htm"/>
 	</topic>
-	<topic label="Navigation aids" href="cdt_o_nav.htm"> 
-		<topic label="Outline View" href="cdt_c_outlineview.htm"/> 
-		<topic label="Project File views" href="cdt_c_proj_file_views.htm"/> 
-		<topic label="C/C++ search" href="cdt_c_search.htm"/> 
-		<topic label="Open declarations" href="cdt_c_open_declarations.htm"/> 
+	<topic label="Navigation aids" href="concepts/cdt_o_nav.htm"> 
+		<topic label="Outline View" href="concepts/cdt_c_outlineview.htm"/> 
+		<topic label="Project File views" href="concepts/cdt_c_proj_file_views.htm"/> 
+		<topic label="C/C++ search" href="concepts/cdt_c_search.htm"/> 
+		<topic label="Open declarations" href="concepts/cdt_c_open_declarations.htm"/> 
 	</topic>
-	<topic label="Build" href="cdt_o_build_conc.htm"> 
-		<topic label="Building C/C++ Projects" href="cdt_c_build_over.htm"/> 
-		<topic label="Manage Build Extensibility Document" href="http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project"/>
+	<topic label="Build" href="concepts/cdt_o_build_conc.htm"> 
+		<topic label="Building C/C++ Projects" href="concepts/cdt_c_build_over.htm"/> 
+		<topic label="Manage Build Extensibility Document" href="concepts/http://dev.eclipse.org/viewcvs/index.cgi/~checkout~/cdt-home/user/Reference%20Documents/Managed_Build/Managed_Build_Extensibility.html?cvsroot=Tools_Project"/>
 	</topic>
-	<topic label="Debug" href="cdt_o_dbg_concepts.htm">
-		<topic label="Adding Break Points" href="cdt_c_brkpnts.htm"/> 
-		<topic label="Debug overview" href="cdt_c_over_dbg.htm"/> 
-		<topic label="Debug information" href="cdt_c_dbg_info.htm"/> 
+	<topic label="Debug" href="concepts/cdt_o_dbg_concepts.htm">
+		<topic label="Adding Break Points" href="concepts/cdt_c_brkpnts.htm"/> 
+		<topic label="Debug overview" href="concepts/cdt_c_over_dbg.htm"/> 
+		<topic label="Debug information" href="concepts/cdt_c_dbg_info.htm"/> 
 	</topic>
 </toc>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 7f8283507e9..625b4ba62d6 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -4,7 +4,7 @@
 
 
 <toc label="Reference">
-	<topic label="C/C++ Views and Editors" href="reference/reference/cdt_o_views.htm">
+	<topic label="C/C++ Views and Editors" href="reference/cdt_o_views.htm">
 		<topic label="Selecting Views and Editors" href="reference/cdt_u_views.htm"/>
 		<topic label="C/C++ Projects view" href="reference/cdt_u_cproj_view.htm"/>	
 		<topic label="Navigator view" href="reference/cdt_u_navigator_view.htm"/>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index 7f5b43bb3ee..3f2678f1fe4 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -48,7 +48,7 @@
 				<topic label="Create a run or debug configuration" href="tasks/cdt_t_new_run_config.htm"/>
 				<topic label="Specify a project and application" href="tasks/cdt_t_run_main.htm"/>
 				<topic label="Specify the execution arguments and the working directory" href="tasks/cdt_t_run_arg.htm"/>
-				<topic label="Set the environment variables and values" href="tasks/tasks/cdt_t_run_env.htm"/>
+				<topic label="Set the environment variables and values" href="tasks/cdt_t_run_env.htm"/>
 				<topic label="Select a debugger" href="tasks/cdt_t_run_dbg.htm"/>
 				<topic label="Specify the location of source files" href="tasks/cdt_t_run_source.htm"/>
 				<topic label="Specifying the location of the run configuration" href="tasks/cdt_t_run_com.htm"/>