diff --git a/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
index ff6f80f..cd190b3 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.jst.server.ui.doc.user/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.server.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.1
-Bundle-Vendor: Eclipse.org
+Bundle-Version: 1.0.1.qualifier
+Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/build.properties b/docs/org.eclipse.jst.server.ui.doc.user/build.properties
index 5789493..36efecf 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/build.properties
+++ b/docs/org.eclipse.jst.server.ui.doc.user/build.properties
@@ -1,4 +1,6 @@
 bin.includes = build_toc.xml,\
+               tomcat_create.xml,\
+               tomcat_pref.xml,\
                plugin.properties,\
                plugin.xml,\
                about.html,\
diff --git a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
index d0ec1be..5adea4f 100644
--- a/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.jst.server.ui.doc.user/plugin.properties
@@ -1,2 +1,15 @@
-# NLS_MESSAGEFORMAT_VAR
-Plugin.name = Server Tools documentation for J2EE Standard Tools
\ No newline at end of file
+###############################################################################
+# Copyright (c) 2001, 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# 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
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# NLS_MESSAGEFORMAT_VAR 
+# NLS_ENCODING=UTF-8 
+
+pluginName = Server Tools documentation for J2EE Standard Tools
+pluginProvider = Eclipse.org
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF b/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF
index 211847d..63f6884 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.wst.server.ui.doc.user/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
-Bundle-Name: %Plugin.name
+Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.server.ui.doc.user; singleton:=true
-Bundle-Version: 1.0.1
-Bundle-Vendor: Eclipse.org
+Bundle-Version: 1.0.1.qualifier
+Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
 Eclipse-AutoStart: true
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/build.properties b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
index 160cfa2..915ea80 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/build.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/build.properties
@@ -1,5 +1,12 @@
 bin.includes = about.html,\
                build_toc.xml,\
+               wtp_main_toc.xml,\
+               wtp_test.xml,\
+               wtp_debug.xml,\
+               wtp_publish.xml,\
+               wtp_create.xml,\
+               wtp_manage.xml,\
+               wtp_pref.xml,\
                images/,\
                plugin.properties,\
                plugin.xml,\
diff --git a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
index 9f29ccc..faa774f 100644
--- a/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
+++ b/docs/org.eclipse.wst.server.ui.doc.user/plugin.properties
@@ -1,2 +1,15 @@
-# NLS_MESSAGEFORMAT_VAR
-Plugin.name = Server Tools documentation for Web Standard Tools
\ No newline at end of file
+###############################################################################
+# Copyright (c) 2001, 2005 IBM Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# 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
+# 
+# Contributors:
+#     IBM Corporation - initial API and implementation
+###############################################################################
+# NLS_MESSAGEFORMAT_VAR 
+# NLS_ENCODING=UTF-8 
+
+pluginName = Server Tools documentation for Web Standard Tools
+pluginProvider = Eclipse.org