20070
diff --git a/update/org.eclipse.update.core.linux/fragment.xml b/update/org.eclipse.update.core.linux/fragment.xml
index b17e046..3211d65 100644
--- a/update/org.eclipse.update.core.linux/fragment.xml
+++ b/update/org.eclipse.update.core.linux/fragment.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fragment
    id="org.eclipse.update.core.linux"
-   name="Install/Update Core for Linux"
+   name="%fragmentNameLinux"
    version="2.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.update.core"
    plugin-version="2.0.0"
    match="compatible">
diff --git a/update/org.eclipse.update.core.win32/fragment.xml b/update/org.eclipse.update.core.win32/fragment.xml
index 21b0ddb..8d13d40 100644
--- a/update/org.eclipse.update.core.win32/fragment.xml
+++ b/update/org.eclipse.update.core.win32/fragment.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fragment
    id="org.eclipse.update.core.win32"
-   name="Install/Update Core for Windows"
+   name="%fragmentNameWin"
    version="2.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.update.core"
    plugin-version="2.0.0"
    match="compatible">
diff --git a/update/org.eclipse.update.core/build.properties b/update/org.eclipse.update.core/build.properties
index 36fe081..d8293a5 100644
--- a/update/org.eclipse.update.core/build.properties
+++ b/update/org.eclipse.update.core/build.properties
@@ -1,3 +1,3 @@
 source.updatecore.jar = src/

 src.includes=about.html

-bin.includes=plugin.xml,plugin.properties,*.jar,about.html,.options,os/

+bin.includes=plugin.xml,plugin.properties,*.jar,about.html,.options,os/,schema/

diff --git a/update/org.eclipse.update.core/doc/deltaHandler.html b/update/org.eclipse.update.core/doc/deltaHandler.html
deleted file mode 100644
index d166e1e..0000000
--- a/update/org.eclipse.update.core/doc/deltaHandler.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HEAD>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</HEAD>
-<HTML>
-<BODY>
-<H1><CENTER>Install/Update Delta Handler</CENTER></H1>
-<H2>Identifier</H2>
-org.eclipse.update.core.deltaHandler<H2>Description</H2>
-[Enter description of this extension point]<H2>Markup</H2>
-<p><samp>&nbsp;&nbsp; &lt;!ELEMENT extension (display)&gt;</samp>
-<br><samp>&nbsp;&nbsp; &lt;!ATTLIST extension</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;point&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;id&nbsp;&nbsp;&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;name&nbsp;&nbsp;CDATA #IMPLIED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</samp>
-<ul>
-<li><b>point</b> - </li><li><b>id</b> - </li><li><b>name</b> - </li></ul>
-<p><samp>&nbsp;&nbsp; &lt;!ELEMENT display (EMPTY)&gt;</samp>
-<br><samp>&nbsp;&nbsp; &lt;!ATTLIST display</samp>
-<br><samp>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;class&nbsp;CDATA #REQUIRED</samp>
-<br><samp>&nbsp;&nbsp; &gt;</samp>
-<ul>
-<li><b>class</b> - </li></ul>
-<H2>Example</H2>
-[Enter extension point usage example here.]<H2>API Information</H2>
-[Enter API information here.]<H2>Supplied Implementation</H2>
-[Enter information about supplied implementation of this extension point.]</BODY>
-</HTML>
diff --git a/update/org.eclipse.update.core/plugin.properties b/update/org.eclipse.update.core/plugin.properties
index 5944539..f35de76 100644
--- a/update/org.eclipse.update.core/plugin.properties
+++ b/update/org.eclipse.update.core/plugin.properties
@@ -1,4 +1,6 @@
 pluginName= Install/Update Core

 providerName= Eclipse.org

+fragmentNameWin= Install/Update Core for Windows

+fragmentNameLinux= Install/Update Core for Linux

 

 

diff --git a/update/org.eclipse.update.core/plugin.xml b/update/org.eclipse.update.core/plugin.xml
index 8a2ca1e..c545ca6 100644
--- a/update/org.eclipse.update.core/plugin.xml
+++ b/update/org.eclipse.update.core/plugin.xml
@@ -20,7 +20,7 @@
    <extension-point id="featureTypes" name="Install/Update Concrete Feature Type Implementation Factory" schema="schema/featureTypes.exsd"/>

    <extension-point id="siteTypes" name="Install/Update Concrete Site Type Implementation Factory" schema="schema/siteTypes.exsd"/>

    <extension-point id="installHandlers" name="Install/Update Global Install Handlers" schema="schema/installHandlers.exsd"/>

-   <extension-point id="deltaHandler" name="Install/Update Delta Handler" schema="schema/deltaHandler.exsd"/>

+   <extension-point id="deltaHandler" name="Install/Update Delta Handler"/>

 

    <extension

          id="reconciler"

diff --git a/update/org.eclipse.update.core/schema/deltaHandler.exsd b/update/org.eclipse.update.core/schema/deltaHandler.exsd
deleted file mode 100644
index 95b3cbd..0000000
--- a/update/org.eclipse.update.core/schema/deltaHandler.exsd
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>

-<!-- Schema file written by PDE -->

-<schema targetNamespace="org.eclipse.update.core">

-<annotation>

-   <appInfo>

-      <meta.schema plugin="org.eclipse.update.core" id="deltaHandler" name="Install/Update Delta Handler"/>

-   </appInfo>

-   <documentation>

-      [Enter description of this extension point]

-   </documentation>

-</annotation>

-

-   <element name="extension">

-      <complexType>

-         <sequence>

-            <element ref="display"/>

-         </sequence>

-         <attribute name="point" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="id" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-         <attribute name="name" type="string">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <element name="display">

-      <complexType>

-         <attribute name="class" type="string" use="required">

-            <annotation>

-               <documentation>

-                  

-               </documentation>

-               <appInfo>

-                  <meta.attribute kind="java" basedOn="org.eclipse.update.configuration.IInstallDeltaHandler"/>

-               </appInfo>

-            </annotation>

-         </attribute>

-      </complexType>

-   </element>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="examples"/>

-      </appInfo>

-      <documentation>

-         [Enter extension point usage example here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="apiInfo"/>

-      </appInfo>

-      <documentation>

-         [Enter API information here.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="implementation"/>

-      </appInfo>

-      <documentation>

-         [Enter information about supplied implementation of this extension point.]

-      </documentation>

-   </annotation>

-

-   <annotation>

-      <appInfo>

-         <meta.section type="copyright"/>

-      </appInfo>

-      <documentation>

-         

-      </documentation>

-   </annotation>

-

-</schema>

diff --git a/update/org.eclipse.update.ui.win32/fragment.xml b/update/org.eclipse.update.ui.win32/fragment.xml
index 01d1694..0464b34 100644
--- a/update/org.eclipse.update.ui.win32/fragment.xml
+++ b/update/org.eclipse.update.ui.win32/fragment.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <fragment
    id="org.eclipse.update.ui.win32"
-   name="Install/Update UI for Windows"
+   name="%fragmentNameWin"
    version="2.0.0"
-   provider-name="Eclipse.org"
+   provider-name="%providerName"
    plugin-id="org.eclipse.update.ui"
    plugin-version="2.0.0"
    match="compatible">
diff --git a/update/org.eclipse.update.ui/plugin.properties b/update/org.eclipse.update.ui/plugin.properties
index 533e439..b59385e 100644
--- a/update/org.eclipse.update.ui/plugin.properties
+++ b/update/org.eclipse.update.ui/plugin.properties
@@ -3,6 +3,7 @@
 #

 pluginName = Install/Update UI

 providerName = Eclipse.org

+fragmentNameWin = Install/Update UI for Windows

 

 updateMenu.label = &Software Updates

 actionSets.softwareUpdates.label = Software Updates

diff --git a/update/org.eclipse.update.ui/plugin.xml b/update/org.eclipse.update.ui/plugin.xml
index 1956dd6..4058df4 100644
--- a/update/org.eclipse.update.ui/plugin.xml
+++ b/update/org.eclipse.update.ui/plugin.xml
@@ -22,7 +22,7 @@
    </requires>

 

 

-   <extension-point id="searchCategory" name="Search Category" schema="schema/searchCategory.xsd"/>

+   <extension-point id="searchCategory" name="Search Category" schema="schema/searchCategory.exsd"/>

 

    <extension

          point="org.eclipse.ui.actionSets">