diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/about.html b/docs/org.eclipse.jst.jsp.ui.infopop/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.jst.jsp.ui.infopop/about.html
+++ b/docs/org.eclipse.jst.jsp.ui.infopop/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
index 4b426b5..aefe666 100644
--- a/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.jst.jsp.ui.infopop/plugin.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.1"?>
 
 <!-- ================================================= -->
diff --git a/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
index fe7dfed..2050e63 100644
--- a/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.doc.user/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@
 Bundle-Name: master user doc toc
 Bundle-SymbolicName: org.eclipse.wst.doc.user; singleton:=true
 Bundle-Version: 0.7.0
-Bundle-Vendor: Eclipse.org
+Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.doc.user/about.html b/docs/org.eclipse.wst.doc.user/about.html
index bc63644..4c99086 100644
--- a/docs/org.eclipse.wst.doc.user/about.html
+++ b/docs/org.eclipse.wst.doc.user/about.html
@@ -1,29 +1,22 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
-
-<p>February 24, 2005</p>
+ 
+<p>February 24, 2005</p>	
 <h3>License</h3>
 
-<p>The Eclipse Foundation makes available all content in this plug-in
-(&quot;Content&quot;). Unless otherwise indicated below, the Content is
-provided to you under the terms and conditions of the Eclipse Public
-License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available at
-<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 (&quot;EPL&quot;).  A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
 For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
 
-<p>If you did not receive this Content directly from the Eclipse
-Foundation, the Content is being redistributed by another party
-(&quot;Redistributor&quot;) and different terms and conditions may apply
-to your use of any object code in the Content. Check the Redistributor's
-license that was provided with the Content. If no such license exists,
-contact the Redistributor. Unless otherwise indicated below, the terms
-and conditions of the EPL still apply to any source code in the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
 
 </body>
-</html>
+</html>
\ No newline at end of file
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/about.html b/docs/org.eclipse.wst.dtd.ui.infopop/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/about.html
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
index ef4bab7..aa57fbc 100644
--- a/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.dtd.ui.infopop/plugin.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!-- ================================================= -->
 <!-- This is the plugin for declaring the help         -->
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
index 066d82e..af5d27b 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/DTDEditormap_toc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html b/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml b/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml
index 0052747..e09310a 100644
--- a/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml
+++ b/docs/org.eclipse.wst.dtdeditor.doc.user/dtdeditor_reference_toc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
diff --git a/docs/org.eclipse.wst.html.ui.infopop/about.html b/docs/org.eclipse.wst.html.ui.infopop/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/about.html
+++ b/docs/org.eclipse.wst.html.ui.infopop/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
index feafd3f..ca695c5 100644
--- a/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.html.ui.infopop/plugin.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!-- ================================================= -->
 <!-- This is the plugin for declaring the help         -->
diff --git a/docs/org.eclipse.wst.sse.doc.user/about.html b/docs/org.eclipse.wst.sse.doc.user/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.sse.doc.user/about.html
+++ b/docs/org.eclipse.wst.sse.doc.user/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml b/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
index c687367..c92d56e 100644
--- a/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
+++ b/docs/org.eclipse.wst.sse.doc.user/sse_toc.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2001, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/about.html b/docs/org.eclipse.wst.sse.ui.infopop/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.sse.ui.infopop/about.html
+++ b/docs/org.eclipse.wst.sse.ui.infopop/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml b/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
index 499afca..79c6bb3 100644
--- a/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
+++ b/docs/org.eclipse.wst.sse.ui.infopop/plugin.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <?eclipse version="3.0"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2001, 2005 IBM Corporation and others.
diff --git a/docs/org.eclipse.wst.webtools.doc.user/about.html b/docs/org.eclipse.wst.webtools.doc.user/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/about.html
+++ b/docs/org.eclipse.wst.webtools.doc.user/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
index 5428770..2149116 100644
--- a/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
+++ b/docs/org.eclipse.wst.webtools.doc.user/webtools_toc.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
@@ -10,21 +11,27 @@
  *     IBM Corporation - initial API and implementation
  *******************************************************************************/ -->
 <toc label="Web application development" topic="topics/ccwebvw.html">
+<topic label="Web application - overview" href="topics/ccwtover.html"
+		id="wtoverview">
  <topic label="Web resources - overview" href="topics/ccwebdev.html">
+ <topic label="The Web perspective" href="topics/ccwebper.html"/>
+ <topic label="Web technologies" href="topics/cwebtechnologies.html" >
       <topic label="Static Web projects" href="topics/ccstatic.html"/>
+      <topic label="Creating a static Web project" href="topics/twcresta.html"/>
       <topic label="Dynamic Web projects and applications" href="topics/ccwebprj.html"/>
+       <topic label="Creating a dynamic Web project" href="topics/twcreprj.html"/>
+       <topic label="Converting static Web projects to dynamic Web projects" href="topics/twpcnvrt.html"/>
       <topic label="Flexible projects"/>
       <topic label="Web archive (WAR) files" href="topics/cwwarovr.html"/>
       <topic label="Servlets" href="topics/cwservbn.html"/>
       <topic label="JavaServer Pages (JSP) technology" href="topics/cpdjsps.html"/>
       <topic label="Page Data view" href="topics/cpagedataview.html"/>
-      		<topic label="Web tools features"
-			href="topics/cwtfeatures.html">
-
-			<topic label="Web technologies"
-				href="topics/cwebtechnologies.html" />
+      <topic label="Web tools features" href="topics/cwtfeatures.html">
+      </topic>
    </topic>
-   <topic label="Project Explorer view and Web development" href="topics/ccwebvw.html"/>
+   </topic>
+   <topic label="Project Explorer view and Web development" href="topics/ccwebvw.html">
+   <topic label="Web development tools" href="topics/cwebdevelopmenttools.html">
    <topic label="The Web deployment descriptor editor" href="topics/ccwebxml.html">
       <topic label="Working in the Overview page" href="topics/twedtwbx1.html"/>
       <topic label="Working in the Servlets page" href="topics/twedtwbx2.html"/>
@@ -37,33 +44,17 @@
       <!-- <topic label="Working in the WS Extensions Page" href="topics/twedtwbxwse.html"/>
       <topic label="Working in the WS Binding Page" href="topics/twedtwbxwsb.html"/>-->
       <topic label="Working in the Extensions Page" href="topics/twedtwbxe.html"/>
+      </topic>
    </topic>
-   	<topic label="Web application overview" href="topics/ccwtover.html"
-		id="wtoverview">
-
-
-
-		</topic>
-
-	<topic label="Web development tools"
-		href="topics/cwebdevelopmenttools.html">
-
-
-					
-				<topic label="Flexible projects" />
-
 			</topic>
 
 		</topic>
-   
-    <topic label="The Web perspective" href="topics/ccwebper.html"/>
-   <topic label="Workbench integration with Web editors" href="topics/cwwedtvw.html"/>
+   <topic label="Workbench integration with Web editors" href="topics/cwwedtvw.html">
    <topic label="Web application overview" href="topics/ccwtover.html"/>
    <topic label="JAR file placement" href="topics/cjarpl.html"/>
    <topic label="Defining HTML file preferences" href="topics/tjprefs.html"/>
    <topic label="Creating and editing Web pages - overview" href="topics/tjdetags.html"/>
    <topic label="Creating a custom tag library" href="topics/tcreatetag.html"/>
-   <topic label="Web development tools" href="topics/cwebdevelopmenttools.html"/>
    <topic label="Web page design" href="topics/cwebpagedesign.html"/>
    <topic label="Web projects" href="topics/cwebprojects.html"/>
    <topic label="Web resources" href="topics/cwebresources.html"/>
@@ -72,6 +63,7 @@
    <topic label="Links view" href="topics/cwlnkvew.html"/>
    <topic label="Exporting resources over FTP" href="topics/tcexpftp.html"/>
    <topic label="Importing class files to Web projects" href="topics/teimpclass.html"/>
+   </topic>
    <topic label="Specifying an implicit document type for an HTML, XHTML, or JSP fragment" href="topics/tjchgxdt.html"/>
    <topic label="Creating HTML and XHTML files and framesets" href="topics/tjcrehtm.html"/>
    <topic label="Creating JavaServer Pages (JSP) files" href="topics/tjcrejsp.html"/>
@@ -91,14 +83,13 @@
    <topic label="Fixing broken links using the Fixup link references wizard" href="topics/twlnkfix.html"/>
    <topic label="Managing links - overview" href="topics/twlnkmgt.html"/>
    <topic label="Creating a new listener class" href="topics/twlstnwz.html"/>
-   <topic label="Converting static Web projects to dynamic Web projects" href="topics/twpcnvrt.html"/>
    <topic label="Adding Web library projects" href="topics/twplib.html"/>
    <topic label="Setting Web project properties" href="topics/twprjset.html"/>
    <topic label="Creating servlets" href="topics/twsrvwiz.html"/>
-   <topic label="Palette view" href="topics/cpalette.html"/>
+   <topic label="Palette view" href="topics/cpalette.html">
    <topic label="Using the Web palette" href="topics/tpalette1.html"/>
    <topic label="Customizing the Web palette" href="topics/tpalette2.html"/>
+   </topic>
    <topic label="Server targeting for Web applications" href="topics/tservertarget.html"/>
    <topic label="Adding or removing an error page from a Web application" href="topics/twedrmerr.html"/>
-<topic label="Server targeting for Web applications" href="topics/tservertarget.html"/>
 </toc>
diff --git a/docs/org.eclipse.wst.xml.ui.infopop/about.html b/docs/org.eclipse.wst.xml.ui.infopop/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.xml.ui.infopop/about.html
+++ b/docs/org.eclipse.wst.xml.ui.infopop/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
index 2f1231f..5b3cc6f 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/XMLBuildermap_toc.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
diff --git a/docs/org.eclipse.wst.xmleditor.doc.user/about.html b/docs/org.eclipse.wst.xmleditor.doc.user/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.xmleditor.doc.user/about.html
+++ b/docs/org.eclipse.wst.xmleditor.doc.user/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
index 818c099..1de94e5 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/XSDeditormap_toc.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html b/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
index 6f6b96c..4c99086 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/about.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
-<title>About</title>
 <meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
+<title>About</title>
 </head>
 <body lang="EN-US">
 <h2>About This Content</h2>
diff --git a/docs/org.eclipse.wst.xsdeditor.doc.user/xsdeditor_reference_toc.xml b/docs/org.eclipse.wst.xsdeditor.doc.user/xsdeditor_reference_toc.xml
index 4844214..1092fa7 100644
--- a/docs/org.eclipse.wst.xsdeditor.doc.user/xsdeditor_reference_toc.xml
+++ b/docs/org.eclipse.wst.xsdeditor.doc.user/xsdeditor_reference_toc.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<?NLS type="org.eclipse.help.contexts"?>
 <!-- /*******************************************************************************
  * Copyright (c) 2000, 2005 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials