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