Corrected topics_*.xml files and updated the build.xml file.

7 files changed, 11 insertions, 16 deletions

diff --git a/doc/org.eclipse.cdt.doc.user/build.xml b/doc/org.eclipse.cdt.doc.user/build.xml
index cd04de10e5e..1f9816e2f48 100644
--- a/doc/org.eclipse.cdt.doc.user/build.xml
+++ b/doc/org.eclipse.cdt.doc.user/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?> 
-- <project name="org.eclipse.jdt.doc.user" default="build.jars" basedir=".">
+- <project name="org.eclipse.cdt.doc.user" default="build.jars" basedir=".">
 - <target name="init">
-  <property name="plugin" value="org.eclipse.jdt.doc.user" /> 
+  <property name="plugin" value="org.eclipse.cdt.doc.user" /> 
   <property name="version.suffix" value="_3.0.0" /> 
   <property name="full.name" value="${plugin}${version.suffix}" /> 
   <property name="temp.folder" value="${basedir}/temp.folder" /> 
@@ -20,7 +20,7 @@
   </target>
 - <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
   <mkdir dir="${destination.temp.folder}/${full.name}" /> 
-  <zip zipfile="${destination.temp.folder}/${full.name}/doc.zip" basedir="${basedir}" includes="*.css, hglegal.htm, ngibmcpy.gif, concepts/**, gettingStarted/**, images/**, reference/**, tasks/**, tips/**, whatsNew/**" /> 
+  <zip zipfile="${destination.temp.folder}/${full.name}/doc.zip" basedir="${basedir}" includes="*.css, concepts/**, getting_started/**, images/**, reference/**, tasks/**" /> 
 - <copy todir="${destination.temp.folder}/${full.name}">
   <fileset dir="${basedir}" includes="*.properties,*.xml,*.zip,*.html,*.htm,*.gif,*.css" excludes="build.properties,build.xml" /> 
   </copy>
diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index 5eb2b2eec15..808b18fb1a1 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -9,7 +9,7 @@
 
    name = "C/C++ Development User Guide"
    id = "org.eclipse.cdt.doc.user"
-   version = "1.0"
+   version = "1.2.0"
   provider-name = "Rational Software: IBM Software Group">
    <!-- Configure the help contribution for this plugin --> 
    <!-- This part should be in a documentation plugin -->
@@ -50,7 +50,7 @@
        <contexts file="contexts_CDT_make.xml" plugin="org.eclipse.cdt.make.ui"/> 
    </extension>
    <extension point="org.eclipse.help.contexts">
-       <contexts file="context_CDT_LAUNCH.xml" plugin="org.eclipse.cdt.launch"/> 
+       <contexts file="contexts_CDT_LAUNCH.xml" plugin="org.eclipse.cdt.launch"/> 
    </extension>
 
 </plugin>
diff --git a/doc/org.eclipse.cdt.doc.user/toc.xml b/doc/org.eclipse.cdt.doc.user/toc.xml
index 159ee8895cb..685842cd619 100644
--- a/doc/org.eclipse.cdt.doc.user/toc.xml
+++ b/doc/org.eclipse.cdt.doc.user/toc.xml
@@ -2,8 +2,7 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 <!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
 
-<toc id="cdt" label="C/C++ Development User Guide" topic="cdt_o_home.htm">
-
+<toc id="cdt" label="C/C++ Development User Guide" topic="concepts/cdt_o_home.htm">
 
 <topic label="Tutorial">
 		<link toc="topics_Getting_Started.xml" />
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
index de6ec0d4e82..d893f6443b0 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Concepts.xml
@@ -2,7 +2,7 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 <!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
 
-    <topic label="Concepts" href="concepts/cdt_o_concepts.htm">
+<toc label="Concepts" href="concepts/cdt_o_concepts.htm">
           <topic label="What's new" href="concepts/cdt_c_whatsnew.htm"/>
           <topic label="CDT overview" href="concepts/cdt_c_over_cdt.htm"/>
           <topic label="How to bring C/C++ source files into Eclipse" href="concepts/cdt_w_existing_code.htm"/>
@@ -24,5 +24,4 @@
                <topic label="Debug overview" href="concepts/cdt_c_over_dbg.htm"/>
                <topic label="Debug information" href="concepts/cdt_c_dbg_info.htm"/>
           </topic>
-     </topic>
-</toc>
+</toc>
\ No newline at end of file
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml b/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
index 4a664f4839d..ad361e93078 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Getting_Started.xml
@@ -2,11 +2,10 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 <!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
 
-     <topic label="Tutorial" href="getting_started/cdt_o_tutorial.htm">
+<toc label="Tutorial" href="getting_started/cdt_o_tutorial.htm">
           <topic label="Creating your project" href="getting_started/cdt_w_newproj.htm"/>
           <topic label="Creating your C++ file" href="getting_started/cdt_w_newcpp.htm"/>
           <topic label="Creating your makefile" href="getting_started/cdt_w_newmake.htm"/>
           <topic label="Building your project" href="getting_started/cdt_w_build.htm"/>
           <topic label="Debugging your project" href="getting_started/cdt_w_debug.htm"/>
-     </topic>     
 </toc>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
index 84189c77e92..fcedbd5c0e4 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Reference.xml
@@ -2,7 +2,7 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 <!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
 
-     <topic label="Reference" href="reference/cdt_o_ref.htm">
+     <toc label="Reference" href="reference/cdt_o_ref.htm">
           <topic label="CDT icons" href="reference/cdt_u_icons.htm"/>
           <topic label="Project properties" href="reference/cdt_o_proj_prop_pages.htm">
                <topic label="Make Builder page, C/C++ Properties window" href="reference/cdt_u_newproj_buildset.htm"/>
@@ -39,5 +39,4 @@
                <topic label="Code Templates page, Preferences window" href="reference/cdt_u_code_temp.htm"/>
                <topic label="C/C++ Search page, Search dialog box" href="reference/cdt_u_search.htm"/>
           </topic>
-     </topic>
 </toc>
diff --git a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
index bc5c1acd6cf..33efd5ac078 100644
--- a/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
+++ b/doc/org.eclipse.cdt.doc.user/topics_Tasks.xml
@@ -2,7 +2,7 @@
 <?NLS TYPE="org.eclipse.help.toc"?>
 <!-- Defines topics that will be inserted under the C/C++ Development User Guide menu-->
 
-     <topic label="Tasks" href="tasks/cdt_o_tasks.htm">
+     <toc label="Tasks" href="tasks/cdt_o_tasks.htm">
           <topic label="Updating the CDT" href="tasks/cdt_t_update_man.htm"/>
           <topic label="Creating a project" href="tasks/cdt_t_proj_new.htm"/>
           <topic label="Defining project properties" href="tasks/cdt_o_proj_prop.htm">
@@ -71,5 +71,4 @@
                <topic label="Working with registers" href="tasks/cdt_t_registers.htm"/>
                <topic label="Working with memory" href="tasks/cdt_t_memory.htm"/>
           </topic>
-     </topic>
 </toc>