diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/api-overview/overview.html b/plugins/org.eclipse.jst.jsf.doc.dev/api-overview/overview.html
index 71b0892..842d76f 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/api-overview/overview.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/api-overview/overview.html
@@ -1,7 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
 <head>
 <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta content="text/html; charset=iso-8859-1" http-equiv="Content-Type">
 <link type="text/css" href="../apistyles.css" rel="stylesheet">
 <title>JSF API Overview</title>
 </head>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html
index 53d2eb9..848af99 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/index.html
@@ -2,13 +2,10 @@
     	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
 		<html xmlns:xalan="http://xml.apache.org/xslt">
 <head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-		<meta name="copyright" content="Copyright (c) IBM Corporation and others 2000, 2005. This page is made available under license. For full details see the LEGAL in the documentation book that contains this page." >
-
-   		<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   		<title>JavaServer Faces Extension Points</title>
-		<LINK REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css">
-		</head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+	<title>JavaServer Faces Extension Points</title>
+	<link REL="STYLESHEET" HREF="../../book.css" CHARSET="ISO-8859-1" TYPE="text/css"/>
+</head>
 <body link="#0000FF" vlink="#800080">
 <center>
 <h1>JSF Extension Points </h1>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html
index 2c1f0a5..171117d 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainLoadingStrategies.html
@@ -32,12 +32,12 @@
 
 Implementing class requires a constructor taking the domainID String.</li>
 </ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6><extension
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6>&lt;extension
          point="org.eclipse.jst.jsf.common.domainLoadingStrategies">
-      <domainLoader
+      &lt;domainLoader
             domainId="TagLibraryDomain"
          domainLoadingStrategy="org.eclipse.jst.jsf.common.metadata.internal.JSPTagLibDomainLoadingStrategy"/>
-   </extension>
+   &lt;/extension>
 <p></p>
 
 <br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html
index 328bad4..c77f7d5 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_domainSourceModelTypeTranslators.html
@@ -30,13 +30,13 @@
 <li><b>domainSourceModelTypeId</b> - The unique id from the domainSourceModelTypes ext-pt that will bind the translator class to that domain source.</li>
 <li><b>translatorClass</b> - Fully qualified class implementing <code>org.eclipse.jst.jsf.common.metadata.IMetaDataTranslator</code> that will translate from the source domain to the "standard" domain of entities and traits.</li>
 </ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6><extension
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6>&lt;extension
          point="org.eclipse.jst.jsf.common.domainSourceModelTypeTranslators">
-      <domainSourceModelTypeTranslator
+      &lt;domainSourceModelTypeTranslator
             class="org.eclipse.jst.jsf.common.metadata.internal.TaglibMetaDataTLDTranslator"
             domainSourceModelTypeId="TagLibMetaDataTagLibraryHandler">
-      </domainSourceModelTypeTranslator>
-   </extension>
+      &lt;/domainSourceModelTypeTranslator>
+   &lt;/extension>
 <p></p>
 
 <br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html
index ffe5719..8a4352a 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_common_standardMetaDataFiles.html
@@ -36,13 +36,13 @@
 eg. /metadata/jsf_core.xml</li>
 <li><b>locator</b> - Class extending <code>org.eclipse.jst.jsf.common.metadata.internal.StandardMetaDataSourceFileLocator</code> that will be used to locate the standard metadata file.</li>
 </ul>
-<br><h6 class=CaptionFigColumn id=header>Examples: </h6><extension
+<br><h6 class=CaptionFigColumn id=header>Examples: </h6>&lt;extension
          point="org.eclipse.jst.jsf.common.standardMetaDataFiles">
-      <standardMetaDataFile
+      &lt;standardMetaDataFile
             location="/metadata/JSF_HTML.xml"
             uri="http://java.sun.com/jsf/html">
-      </standardMetaDataFile>
-   </extension>
+      &lt;/standardMetaDataFile>
+   &lt;/extension>
 <p></p>
 
 <br>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
index 159d6a7..e54321a 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_AttributeValueRuntimeTypes.html
@@ -47,7 +47,7 @@
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
- 
+<br>
 Contributors:
     Gerry Kessler/Oracle - initial API and implementation
 <p></p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html
index 1f8269b..997e5a2 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_MetaDataEnabledFeatures.html
@@ -41,7 +41,7 @@
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
- 
+<br> 
 Contributors:
     Gerry Kessler/Oracle - initial API and implementation
 <p></p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html
index dd78dec..87b675f 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_jsfLibraries.html
@@ -63,7 +63,7 @@
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
-
+<br>
 Contributors:
 Gerry Kessler - initial API and implementation
 <p></p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html
index 52380ce..055a651 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/extpts_reference/jsf/org_eclipse_jst_jsf_core_pluginProvidedJsfLibraries.html
@@ -66,7 +66,7 @@
 are made available under the terms of the Eclipse Public License v1.0
 which accompanies this distribution, and is available at
 http://www.eclipse.org/legal/epl-v10.html
-
+<br>
 Contributors:
 Gerry Kessler - initial API and implementation
 <p></p>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/programmersguide/design-time_tag_metadata_operations.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/programmersguide/design-time_tag_metadata_operations.html
index 6c8e8ba..deafc2c 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/programmersguide/design-time_tag_metadata_operations.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/programmersguide/design-time_tag_metadata_operations.html
@@ -4,8 +4,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
-	<title>Design-Time Tag Metadata Operations</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Design-Time Tag Metadata Operations</title>
 	<meta http-equiv="Content-Style-Type" content="text/css"/>
 	<meta http-equiv="Content-Script-Type" content="text/javascript"/>
 	<link rel="stylesheet" href="../../book.css" type="text/css"/>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/Providing_Design-Time_Tag_Metadata.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/Providing_Design-Time_Tag_Metadata.html
index 1cc16c0..a89d7c5 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/Providing_Design-Time_Tag_Metadata.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/Providing_Design-Time_Tag_Metadata.html
@@ -4,8 +4,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
-	<title>Providing Design-Time Tag Metadata</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Providing Design-Time Tag Metadata</title>
 	<meta http-equiv="Content-Style-Type" content="text/css"/>
 	<meta http-equiv="Content-Script-Type" content="text/javascript"/>
 	<link rel="stylesheet" href="../../book.css" type="text/css"/>
diff --git a/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/implementing_a_new_tag_based_el_variable_contributor_for_jsp.html b/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/implementing_a_new_tag_based_el_variable_contributor_for_jsp.html
index 4c17b8b..7af51fd 100644
--- a/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/implementing_a_new_tag_based_el_variable_contributor_for_jsp.html
+++ b/plugins/org.eclipse.jst.jsf.doc.dev/html/tutorials/implementing_a_new_tag_based_el_variable_contributor_for_jsp.html
@@ -8,8 +8,8 @@
 
 <meta http-equiv="Content-Style-Type" content="text/css">
 <meta http-equiv="Content-Script-Type" content="text/javascript">
-<link rel="stylesheet" href="../../book.css" type="text/css" />
-<link rel="stylesheet" href="default_style.css" type="text/css" />
+<link rel="stylesheet" href="../../book.css" type="text/css">
+<link rel="stylesheet" href="default_style.css" type="text/css">
 </head>
 
 <body>
diff --git a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/wpe/wpe_getting_started.html b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/wpe/wpe_getting_started.html
index c8fe53b..8cdcfa6 100644
--- a/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/wpe/wpe_getting_started.html
+++ b/plugins/org.eclipse.jst.jsf.doc.user/html/gettingstarted/wpe/wpe_getting_started.html
@@ -4,8 +4,8 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <head>
-	<title>Web Page Editor</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+	<title>Web Page Editor</title>
 	<meta http-equiv="Content-Style-Type" content="text/css"/>
 	<meta http-equiv="Content-Script-Type" content="text/javascript"/>
 	<link rel="stylesheet" href="../../../book.css" type="text/css"/>