[140233] Corrected WTP feature versions, names, copyrights, licenses, and update site links.
diff --git a/features/org.eclipse.wst.server_userdoc.feature/build.properties b/features/org.eclipse.wst.server_userdoc.feature/build.properties
index d6a4dce..7f47694 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/build.properties
+++ b/features/org.eclipse.wst.server_userdoc.feature/build.properties
@@ -3,8 +3,3 @@
epl-v10.html,\
license.html,\
feature.properties
-src.includes = license.html,\
- feature.xml,\
- epl-v10.html,\
- eclipse_update_120.jpg,\
- build.properties
diff --git a/features/org.eclipse.wst.server_userdoc.feature/feature.properties b/features/org.eclipse.wst.server_userdoc.feature/feature.properties
index 64893f7..fd7bc01 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/feature.properties
+++ b/features/org.eclipse.wst.server_userdoc.feature/feature.properties
@@ -15,14 +15,28 @@
# This file should be translated.
# "featureName" property - name of the feature
+featureName=WST Server User Documentation
# "providerName" property - name of the company that provides the feature
providerName=Eclipse.org
# "updateSiteName" property - label for the update site
-updateSiteName=Eclipse.org update site
+updateSiteName=The Eclipse Web Tools Platform (WTP) Project update site
# "description" property - description of the feature
+description=WST server user documentation
+
+# "copyright" property - text of the "Feature Update Copyright"
+copyright=\
+Copyright (c) 2006 IBM Corporation and others.\n\
+All rights reserved. This program and the accompanying materials\n\
+are made available under the terms of the Eclipse Public License v1.0\n\
+which accompanies this distribution, and is available at\n\
+http://www.eclipse.org/legal/epl-v10.html\n\
+\n\
+Contributors:\n\
+ IBM Corporation - initial API and implementation\n
+################ end of copyright property ####################################
# "licenseURL" property - URL of the "Feature License"
# do not translate value - just change to point to a locale-specific HTML page
diff --git a/features/org.eclipse.wst.server_userdoc.feature/feature.xml b/features/org.eclipse.wst.server_userdoc.feature/feature.xml
index a688490..78f33e4 100644
--- a/features/org.eclipse.wst.server_userdoc.feature/feature.xml
+++ b/features/org.eclipse.wst.server_userdoc.feature/feature.xml
@@ -1,18 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.wst.server_userdoc.feature"
- label="User Documentation for WST Server Feature"
- version="1.5.0.qualifier">
+ label="%featureName"
+ version="1.5.0.qualifier"
+ provider-name="%providerName">
<description>
%description
</description>
+ <copyright>
+ %copyright
+ </copyright>
+
<license url="license.html">
%license
</license>
+
<url>
- <update label="Web Tools Platform (WTP) Updates" url="http://download.eclipse.org/webtools/updates/"/>
+ <update label="%updateSiteName" url="http://download.eclipse.org/webtools/updates/"/>
</url>
<plugin