updated extension point doc and copyrights

1 files changed, 25 insertions, 28 deletions

diff --git a/bundles/org.eclipse.compare/schema/contentMergeViewers.exsd b/bundles/org.eclipse.compare/schema/contentMergeViewers.exsd
index faaacedf2..883d415c7 100644
--- a/bundles/org.eclipse.compare/schema/contentMergeViewers.exsd
+++ b/bundles/org.eclipse.compare/schema/contentMergeViewers.exsd
@@ -2,19 +2,18 @@
 <!-- Schema file written by PDE -->
 <schema targetNamespace="org.eclipse.compare">
 <annotation>
-   <appInfo>
-      <meta.schema plugin="org.eclipse.compare" id="contentMergeViewers" name="ContentMerge Viewers"/>
-   </appInfo>
-   <documentation>
-      This extension point allows to plug in a compare/merge 
-viewer for specific content types. The viewer must 
+      <appInfo>
+         <meta.schema plugin="org.eclipse.compare" id="contentMergeViewers" name="ContentMerge Viewers"/>
+      </appInfo>
+      <documentation>
+         This extension point allows a plug-in to register compare/merge 
+viewers for specific content types. The viewer is expected to 
 extend &lt;samp&gt;org.eclipse.jface.viewers.Viewer&lt;/samp&gt;. 
-However since viewers don't have a default constructor 
-the extension point must implement a factory object 
-for viewers: the interface 
-&lt;samp&gt;org.eclipse.compare.IViewerCreator&lt;/samp&gt;.
-   </documentation>
-</annotation>
+However, since viewers don&apos;t have a default constructor, 
+the extension point must implement the factory interface 
+for viewers &lt;samp&gt;org.eclipse.compare.IViewerCreator&lt;/samp&gt;.
+      </documentation>
+   </annotation>
 
    <element name="extension">
       <complexType>
@@ -46,11 +45,6 @@ for viewers: the interface
    </element>
 
    <element name="viewer">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute=""/>
-         </appInfo>
-      </annotation>
       <complexType>
          <attribute name="id" type="string" use="required">
             <annotation>
@@ -62,9 +56,7 @@ for viewers: the interface
          <attribute name="class" type="string" use="required">
             <annotation>
                <documentation>
-                  name of a class that implements a factory for the 
-content merge viewer and implements
-&lt;samp&gt;org.eclipse.compare.IViewerCreator&lt;/samp&gt;
+                  name of a class that implements &lt;samp&gt;org.eclipse.compare.IViewerCreator&lt;/samp&gt;
                </documentation>
                <appInfo>
                   <meta.attribute kind="java" basedOn="org.eclipse.jface.viewers.Viewer:org.eclipse.compare.IViewerCreator"/>
@@ -74,7 +66,7 @@ content merge viewer and implements
          <attribute name="extensions" type="string" use="required">
             <annotation>
                <documentation>
-                  a comma separated list of file extensions e.g . "java, gif"
+                  a comma separated list of file extensions e.g. &quot;java, gif&quot;
                </documentation>
             </annotation>
          </attribute>
@@ -86,15 +78,15 @@ content merge viewer and implements
          <meta.section type="examples"/>
       </appInfo>
       <documentation>
-         The following is an example of compare/merge viewer 
-for text files (extension "txt"):
+         The following is an example of a compare/merge viewer 
+for text files (extension &quot;txt&quot;):
 &lt;p&gt;
 &lt;pre&gt; 
-&lt;extension point = "org.eclipse.compare.contentMergeViewers"&gt; 
+&lt;extension point = &quot;org.eclipse.compare.contentMergeViewers&quot;&gt; 
      &lt;viewer 
-         id="org.eclipse.compare.contentmergeviewer.TextMergeViewer" 
-         class="org.eclipse.compare.internal.TextMergeViewerCreator" 
-         extensions="txt" 
+         id=&quot;org.eclipse.compare.contentmergeviewer.TextMergeViewer&quot; 
+         class=&quot;org.eclipse.compare.internal.TextMergeViewerCreator&quot; 
+         extensions=&quot;txt&quot; 
     /&gt; 
 &lt;/extension&gt; 
 &lt;/pre&gt;
@@ -125,7 +117,12 @@ for text files (extension "txt"):
          <meta.section type="copyright"/>
       </appInfo>
       <documentation>
-         
+         &lt;p&gt;
+&lt;a href=&quot;hglegal.htm&quot;&gt;
+ &lt;img SRC=&quot;ngibmcpy.gif&quot;
+   ALT=&quot;Copyright IBM Corp. 2000, 2003. All Rights Reserved.&quot;
+   BORDER=0 height=14 width=324&gt;&lt;/a&gt;
+&lt;/p&gt;
       </documentation>
    </annotation>