diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..2b87d3c
--- /dev/null
+++ b/docs/org.eclipse.jst.jsp.ui.infopop/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: JSP infopop
+Bundle-SymbolicName: org.eclipse.jst.jsp.ui.infopop; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties b/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
index a68560a..da5f6a4 100644
--- a/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
+++ b/docs/org.eclipse.jst.jsp.ui.infopop/build.properties
@@ -1,4 +1,5 @@
 bin.includes = EditorJspContexts.xml,\
                about.html,\
-               plugin.xml
+               plugin.xml,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
index efc5f97..12ddcb3 100644
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
@@ -15,14 +15,10 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-<plugin
-   id="org.eclipse.jst.jsp.ui.infopop"
-   name="JSP infopop"
-   version="0.7.0"
-   provider-name="Eclipse.org">
+<plugin>
 
 <extension point="org.eclipse.help.contexts">
-       <contexts file="EditorJspContexts.xml" plugin ="org.eclipse.jst.jsp.ui"/>
+       <contexts file="EditorJspContexts.xml" plugin="org.eclipse.jst.jsp.ui"/>
 </extension>
 
 
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..27c56c0
--- /dev/null
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DTD infopops
+Bundle-SymbolicName: org.eclipse.wst.dtd.ui.infopop; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
index c085bda..b453de0 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/build.properties
@@ -1,5 +1,6 @@
 bin.includes = plugin.xml,\
                plugin.properties,\
                about.html,\
-               EditorDtdContexts.xml
+               EditorDtdContexts.xml,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
index 6c01c5b..e79eaa7 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
@@ -14,11 +14,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-<plugin
-   id="org.eclipse.wst.dtd.ui.infopop"
-   name="DTD infopops"
-   version="0.7.0"
-   provider-name="Eclipse.org">
+<plugin>
 
 <extension point="org.eclipse.help.contexts">
        <contexts file="EditorDtdContexts.xml" plugin ="org.eclipse.wst.dtd.ui"/>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..8179b4a
--- /dev/null
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: DTD Editor documentation
+Bundle-SymbolicName: org.eclipse.wst.dtdeditor.doc.user; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties b/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
index 3bdb306..169d040 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/build.properties
@@ -4,5 +4,6 @@
                images/,\
                plugin.properties,\
                plugin.xml,\
-               topics/
+               topics/,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
index d657ee5..4f44e65 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/plugin.xml
@@ -10,11 +10,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-<plugin
-    name = "DTD Editor documentation"
-    id = "org.eclipse.wst.dtdeditor.doc.user"
-    version = "0.7.0"
-    provider-name = "Eclipse.org">
+<plugin>
 
   <extension point="org.eclipse.help.toc">
 
diff --git a/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..9db441f
--- /dev/null
+++ b/docs/org.eclipse.wst.html.ui.infopop/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: HTML editor infopops
+Bundle-SymbolicName: org.eclipse.wst.html.ui.infopop; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.html.ui.infopop/build.properties b/docs/org.eclipse.wst.html.ui.infopop/build.properties
index a5ee456..2364fdd 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.html.ui.infopop/build.properties
@@ -1,4 +1,5 @@
 bin.includes = plugin.xml,\
                about.html,\
-               EditorHtmlContexts.xml
+               EditorHtmlContexts.xml,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
index eda742f..1b4f872 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
@@ -14,11 +14,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-<plugin
-   id="org.eclipse.wst.html.ui.infopop"
-   name="HTML editor infopops"
-   version="0.7.0"
-   provider-name="Eclipse.org">
+<plugin>
 
 <extension point="org.eclipse.help.contexts">
        <contexts file="EditorHtmlContexts.xml" plugin ="org.eclipse.wst.html.ui"/>
diff --git a/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..43fd2a3
--- /dev/null
+++ b/docs/org.eclipse.wst.sse.doc.user/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Structured text editor and snippets documentation
+Bundle-SymbolicName: org.eclipse.wst.sse.doc.user; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.sse.doc.user/build.properties b/docs/org.eclipse.wst.sse.doc.user/build.properties
index c50bf5c..52caaf4 100644
--- a/docs/org.eclipse.wst.sse.doc.user/build.properties
+++ b/docs/org.eclipse.wst.sse.doc.user/build.properties
@@ -2,5 +2,6 @@
                images/,\
                plugin.xml,\
                sse_toc.xml,\
-               topics/
+               topics/,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.sse.doc.user/plugin.xml b/docs/org.eclipse.wst.sse.doc.user/plugin.xml
index 15a1d5a..6c83bbd 100644
--- a/docs/org.eclipse.wst.sse.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.sse.doc.user/plugin.xml
@@ -16,16 +16,9 @@
 <!-- for the structured text editors (source editors).     -->
 <!-- ===================================================== -->
 
-<plugin
-   id="org.eclipse.wst.sse.doc.user"
-   name="Structured text editor and snippets documentation"
-   version="0.7.0"
-   vendor-name = "Eclipse.org">
+<plugin>
 
-   <runtime>
-   </runtime>
-
-   <extension point="org.eclipse.help.toc">
+    <extension point="org.eclipse.help.toc">
       <toc file="sse_toc.xml">
       </toc>
    </extension>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b06bb4f
--- /dev/null
+++ b/docs/org.eclipse.wst.sse.ui.infopop/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: SSE infopops
+Bundle-SymbolicName: org.eclipse.wst.sse.ui.infopop; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/build.properties b/docs/org.eclipse.wst.sse.ui.infopop/build.properties
index bd4e8d8..ac9ba16 100644
--- a/docs/org.eclipse.wst.sse.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.sse.ui.infopop/build.properties
@@ -1,4 +1,5 @@
 bin.includes = EditorContexts.xml,\
                about.html,\
-               plugin.xml
+               plugin.xml,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml b/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
index 3ceafc6..499afca 100644
--- a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
@@ -11,11 +11,7 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
 
-<plugin
-   id="org.eclipse.wst.sse.ui.infopop"
-   name="SSE infopops"
-   version="0.7.0"
-   provider-name="Eclipse.org">
+<plugin>
 
 <extension point="org.eclipse.help.contexts">
        <contexts file="EditorContexts.xml" plugin ="org.eclipse.wst.sse.ui"/>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..551055b
--- /dev/null
+++ b/docs/org.eclipse.wst.webtools.doc.user/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Web tools documentation
+Bundle-SymbolicName: org.eclipse.wst.webtools.doc.user; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.webtools.doc.user/build.properties b/docs/org.eclipse.wst.webtools.doc.user/build.properties
index c160536..4f5487d 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/build.properties
+++ b/docs/org.eclipse.wst.webtools.doc.user/build.properties
@@ -4,5 +4,6 @@
                webtools_toc.xml,\
                about.html,\
                images/,\
-               topics/
+               topics/,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml b/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
index 9440e93..d7e149f 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.webtools.doc.user/plugin.xml
@@ -11,10 +11,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-   <plugin id="org.eclipse.wst.webtools.doc.user"
-   name="Web tools documentation"
-   version="0.7.0"
-   provider-name="Eclipse.org"> 
+   <plugin> 
        <extension point="org.eclipse.help.toc">
          	<toc file="webtools_toc.xml" /> 
          	   </extension>  
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..ec9769b
--- /dev/null
+++ b/docs/org.eclipse.wst.xml.ui.infopop/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: XML infopops
+Bundle-SymbolicName: org.eclipse.wst.xml.ui.infopop; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/build.properties b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
index 6d25523..1c488fa 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/build.properties
+++ b/docs/org.eclipse.wst.xml.ui.infopop/build.properties
@@ -2,5 +2,6 @@
                EditorXmlContexts.xml,\
                about.html,\
                plugin.properties,\
-               plugin.xml
+               plugin.xml,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml b/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
index c382efe..07d4238 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.xml.ui.infopop/plugin.xml
@@ -10,11 +10,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-<plugin
-   id="org.eclipse.wst.xml.ui.infopop"
-   name="XML infopops"
-   version="0.7.0"
-   provider-name="Eclipse.org">
+<plugin>
 
 <extension point="org.eclipse.help.contexts">
        <contexts file="EditorXmlContexts.xml" plugin ="org.eclipse.wst.xml.ui"/>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e7ce2c8
--- /dev/null
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Plugin.name
+Bundle-SymbolicName: org.eclipse.wst.xmleditor.doc.user; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties b/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
index f067ebf..b2a5023 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/build.properties
@@ -3,5 +3,6 @@
                images/,\
                plugin.properties,\
                plugin.xml,\
-               topics/
+               topics/,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
index 6fb4d69..6a201a4 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/plugin.xml
@@ -10,11 +10,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-<plugin
-    name = "%Plugin.name"
-    id = "org.eclipse.wst.xmleditor.doc.user"
-    version = "0.7.0"
-    provider-name = "Eclipse.org">
+<plugin>
 
   <extension point="org.eclipse.help.toc">
 
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a0b556c
--- /dev/null
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Plugin.name
+Bundle-SymbolicName: org.eclipse.wst.xsdeditor.doc.user; singleton:=true
+Bundle-Version: 0.7.0
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties b/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
index 9f5c341..b9ce6e5 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/build.properties
@@ -4,5 +4,6 @@
                plugin.properties,\
                plugin.xml,\
                topics/,\
-               xsdeditor_reference_toc.xml
+               xsdeditor_reference_toc.xml,\
+               META-INF/
 src.includes = build.properties
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
index aa37537..08f2575 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/plugin.xml
@@ -10,11 +10,7 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
-<plugin
-    name = "%Plugin.name"
-    id = "org.eclipse.wst.xsdeditor.doc.user"
-    version = "0.7.0"
-    provider-name = "Eclipse.org">
+<plugin>
 
   <extension point="org.eclipse.help.toc">