This commit is a 'manual' merge with 1.4 branch. This move is due to complex lifecycle between the master branch and the other stream branches

1 files changed, 13 insertions, 18 deletions

diff --git a/releng/org.eclipse.emf.eef.update/category.xml b/releng/org.eclipse.emf.eef.update/category.xml
index c10234012..e54fc9c59 100644
--- a/releng/org.eclipse.emf.eef.update/category.xml
+++ b/releng/org.eclipse.emf.eef.update/category.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

-    Copyright (c) 2008, 2010 Obeo.

-    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:

-        Obeo - initial API and implementation

- -->

+<!--
+    Copyright (c) 2008, 2010 Obeo.
+    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:
+        Obeo - initial API and implementation
+ -->
 <site>

    <description>

       To install these features, point Eclipse at this site.

@@ -27,19 +27,19 @@
    </feature>

    <feature id="org.eclipse.emf.eef.extended-feature" version="0.0.0">

       <category name="eef.extension"/>

-   </feature>

+   </feature>
    <feature id="org.eclipse.emf.eef.collab.runtime-feature" version="0.0.0">

       <category name="eef.extension"/>

    </feature>

    <category-def name="eef.sdk" label="EEF SDK">

       <description>

-         EEF SDK package. It contains runtime, metamodels, generators,

+         EEF SDK package. It contains runtime, metamodels, generators,
    documentation and extended capabilities (with source).

       </description>

    </category-def>

    <category-def name="eef.features" label="EEF Common">

       <description>

-         Contains all necessary features for EEF : EEF runtime, EEF metamodels, EEF

+         Contains all necessary features for EEF : EEF runtime, EEF metamodels, EEF
    generators and EEF documentation.

       </description>

    </category-def>

@@ -48,11 +48,6 @@
          EEF integration for specific cases, like UML2.

       </description>

    </category-def>

-   <category-def name="eef.tests" label="EEF Tests Utilities">

-      <description>

-         Several utilities for testing EEF forms.

-      </description>

-   </category-def>

    <category-def name="eef.extension" label="EEF Extension">

       <description>

          EEF Extensions.