diff --git a/doc/org.eclipse.cdt.doc.user/plugin.xml b/doc/org.eclipse.cdt.doc.user/plugin.xml
index 5bb34f72fc6..5eb2b2eec15 100644
--- a/doc/org.eclipse.cdt.doc.user/plugin.xml
+++ b/doc/org.eclipse.cdt.doc.user/plugin.xml
@@ -1,57 +1,56 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
-   id="org.eclipse.cdt.doc.user"
-   name="C/C++ Development User Guide"
-   version="2.0.0"
-   provider-name="eclipse.org">
 
-   <runtime>
-   </runtime>
+<!-- ================================================= -->
+<!-- This is the plugin for declaring the help         -->
+<!-- contributions of a doc component plugin.          -->
+<!-- ================================================= -->
 
-<!-- Configure the help contribution for this plugin -->
-<!-- This part should be in a documentation plugin -->
-   <extension
-         point="org.eclipse.help.toc">
-      <toc
-            file="toc.xml"
-            primary="true">
-      </toc>
+<plugin 
+
+   name = "C/C++ Development User Guide"
+   id = "org.eclipse.cdt.doc.user"
+   version = "1.0"
+  provider-name = "Rational Software: IBM Software Group">
+   <!-- Configure the help contribution for this plugin --> 
+   <!-- This part should be in a documentation plugin -->
+
+<!-- ============================================================================= -->
+<!-- Define primary TOC                                                            -->
+<!-- ============================================================================= -->
+
+   <extension point="org.eclipse.help.toc">
+       <toc file="toc.xml" primary="true" /> 
    </extension>
-   <extension
-         point="org.eclipse.help.contexts">
-      <contexts
-            file="contexts_CDT.xml"
-            plugin="org.eclipse.cdt.ui">
-      </contexts>
+
+<!-- ============================================================================= -->
+<!-- Define TOCs                                                                   -->
+<!-- ============================================================================= -->
+
+   <extension point="org.eclipse.help.toc">
+       <toc file="topics_Getting_Started.xml" />
+	 <toc file="topics_Concepts.xml" />
+       <toc file="topics_Tasks.xml" />
+       <toc file="topics_Reference.xml" />
    </extension>
-   <extension
-         point="org.eclipse.help.contexts">
-      <contexts
-            file="contexts_CDT_DEBUGGER.xml"
-            plugin="org.eclipse.cdt.debug.ui">
-      </contexts>
+
+<!-- ============================================================================= -->
+<!-- F1 context files                                                              -->
+<!-- ============================================================================= -->
+
+   <extension point="org.eclipse.help.contexts">
+       <contexts file="contexts_CDT.xml" plugin="org.eclipse.cdt.ui"/> 
    </extension>
-   <extension
-         point="org.eclipse.help.contexts">
-      <contexts
-            file="contexts_CDT_DEBUGGER_MI.xml"
-            plugin="org.eclipse.cdt.debug.mi.ui">
-      </contexts>
+   <extension point="org.eclipse.help.contexts">
+       <contexts file="contexts_CDT_DEBUGGER.xml" plugin="org.eclipse.cdt.debug.ui"/> 
    </extension>
-   <extension
-         point="org.eclipse.help.contexts">
-      <contexts
-            file="contexts_CDT_make.xml"
-            plugin="org.eclipse.cdt.make.ui">
-      </contexts>
+   <extension point="org.eclipse.help.contexts">
+       <contexts file="contexts_CDT_DEBUGGER_MI.xml" plugin="org.eclipse.cdt.debug.mi.ui"/> 
    </extension>
-   <extension
-         point="org.eclipse.help.contexts">
-      <contexts
-            file="contexts_CDT_LAUNCH.xml"
-            plugin="org.eclipse.cdt.launch">
-      </contexts>
+   <extension point="org.eclipse.help.contexts">
+       <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"/> 
    </extension>
 
 </plugin>