diff --git a/doc/org.eclipse.uml2.doc-feature/feature.properties b/doc/org.eclipse.uml2.doc-feature/feature.properties
index fa3d989..26f07b8 100644
--- a/doc/org.eclipse.uml2.doc-feature/feature.properties
+++ b/doc/org.eclipse.uml2.doc-feature/feature.properties
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: feature.properties,v 1.7 2006/06/10 20:14:09 khussey Exp $
+# $Id: feature.properties,v 1.7.2.1 2006/07/12 16:04:42 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
@@ -43,7 +43,7 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-January 28, 2004\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -72,13 +72,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 Features may also include other Features ("Included Features"). Files named\n\
 "feature.xml" may contain a list of the names and version numbers of\n\
@@ -93,7 +97,8 @@
 \n\
    - The top-level (root) directory\n\
    - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
    - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
@@ -108,7 +113,7 @@
 use of the associated Content in that directory.\n\
 \n\
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
     - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
@@ -130,7 +135,9 @@
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
 
 # ==============================================================================
diff --git a/examples/org.eclipse.uml2.examples-feature/feature.properties b/examples/org.eclipse.uml2.examples-feature/feature.properties
index a13b3c3..3dcc4aa 100644
--- a/examples/org.eclipse.uml2.examples-feature/feature.properties
+++ b/examples/org.eclipse.uml2.examples-feature/feature.properties
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: feature.properties,v 1.7 2006/06/10 20:14:11 khussey Exp $
+# $Id: feature.properties,v 1.7.2.1 2006/07/12 16:04:47 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
@@ -43,7 +43,7 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-January 28, 2004\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -72,13 +72,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 Features may also include other Features ("Included Features"). Files named\n\
 "feature.xml" may contain a list of the names and version numbers of\n\
@@ -93,7 +97,8 @@
 \n\
    - The top-level (root) directory\n\
    - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
    - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
@@ -108,7 +113,7 @@
 use of the associated Content in that directory.\n\
 \n\
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
     - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
@@ -130,7 +135,9 @@
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
 
 # ==============================================================================
diff --git a/examples/org.eclipse.uml2.examples-feature/sourceTemplateFeature/feature.properties b/examples/org.eclipse.uml2.examples-feature/sourceTemplateFeature/feature.properties
index a55d065..74979ad 100644
--- a/examples/org.eclipse.uml2.examples-feature/sourceTemplateFeature/feature.properties
+++ b/examples/org.eclipse.uml2.examples-feature/sourceTemplateFeature/feature.properties
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: feature.properties,v 1.7 2006/06/12 13:04:39 khussey Exp $
+# $Id: feature.properties,v 1.7.2.1 2006/07/12 16:04:47 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
@@ -43,7 +43,7 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-January 28, 2004\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -72,13 +72,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 Features may also include other Features ("Included Features"). Files named\n\
 "feature.xml" may contain a list of the names and version numbers of\n\
@@ -93,7 +97,8 @@
 \n\
    - The top-level (root) directory\n\
    - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
    - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
@@ -108,7 +113,7 @@
 use of the associated Content in that directory.\n\
 \n\
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
     - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
@@ -130,7 +135,9 @@
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
 
 # ==============================================================================
diff --git a/plugins/org.eclipse.uml2-feature/feature.properties b/plugins/org.eclipse.uml2-feature/feature.properties
index aeb40dd..5484d73 100644
--- a/plugins/org.eclipse.uml2-feature/feature.properties
+++ b/plugins/org.eclipse.uml2-feature/feature.properties
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: feature.properties,v 1.8 2006/06/10 20:14:10 khussey Exp $
+# $Id: feature.properties,v 1.8.2.1 2006/07/12 16:04:43 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
@@ -43,7 +43,7 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-January 28, 2004\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -72,13 +72,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 Features may also include other Features ("Included Features"). Files named\n\
 "feature.xml" may contain a list of the names and version numbers of\n\
@@ -93,7 +97,8 @@
 \n\
    - The top-level (root) directory\n\
    - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
    - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
@@ -108,7 +113,7 @@
 use of the associated Content in that directory.\n\
 \n\
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
     - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
@@ -130,7 +135,9 @@
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
 
 # ==============================================================================
diff --git a/plugins/org.eclipse.uml2-feature/sourceTemplateFeature/feature.properties b/plugins/org.eclipse.uml2-feature/sourceTemplateFeature/feature.properties
index 7d696b9..7ab57e0 100644
--- a/plugins/org.eclipse.uml2-feature/sourceTemplateFeature/feature.properties
+++ b/plugins/org.eclipse.uml2-feature/sourceTemplateFeature/feature.properties
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: feature.properties,v 1.8 2006/06/12 13:04:37 khussey Exp $
+# $Id: feature.properties,v 1.8.2.1 2006/07/12 16:04:43 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
@@ -43,7 +43,7 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-January 28, 2004\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -72,13 +72,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 Features may also include other Features ("Included Features"). Files named\n\
 "feature.xml" may contain a list of the names and version numbers of\n\
@@ -93,7 +97,8 @@
 \n\
    - The top-level (root) directory\n\
    - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
    - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
@@ -108,7 +113,7 @@
 use of the associated Content in that directory.\n\
 \n\
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
     - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
@@ -130,7 +135,9 @@
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
 
 # ==============================================================================
diff --git a/plugins/org.eclipse.uml2.sdk-feature/feature.properties b/plugins/org.eclipse.uml2.sdk-feature/feature.properties
index 2130dd9..297cddc 100644
--- a/plugins/org.eclipse.uml2.sdk-feature/feature.properties
+++ b/plugins/org.eclipse.uml2.sdk-feature/feature.properties
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: feature.properties,v 1.7 2006/06/10 20:14:12 khussey Exp $
+# $Id: feature.properties,v 1.7.2.1 2006/07/12 16:04:46 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
@@ -43,7 +43,7 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-January 28, 2004\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -72,13 +72,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 Features may also include other Features ("Included Features"). Files named\n\
 "feature.xml" may contain a list of the names and version numbers of\n\
@@ -93,7 +97,8 @@
 \n\
    - The top-level (root) directory\n\
    - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
    - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
@@ -108,7 +113,7 @@
 use of the associated Content in that directory.\n\
 \n\
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
     - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
@@ -130,7 +135,9 @@
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
 
 # ==============================================================================
diff --git a/tests/org.eclipse.uml2.tests-feature/feature.properties b/tests/org.eclipse.uml2.tests-feature/feature.properties
index d8494e5..457fe53 100644
--- a/tests/org.eclipse.uml2.tests-feature/feature.properties
+++ b/tests/org.eclipse.uml2.tests-feature/feature.properties
@@ -7,7 +7,7 @@
 # Contributors: 
 #   IBM - initial API and implementation
 #
-# $Id: feature.properties,v 1.7 2006/06/10 20:14:08 khussey Exp $
+# $Id: feature.properties,v 1.7.2.1 2006/07/12 16:04:45 khussey Exp $
 
 # NLS_MESSAGEFORMAT_VAR
 
@@ -43,7 +43,7 @@
 # should be plain text version of license agreement pointed to be "licenseURL"
 license=\
 ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-January 28, 2004\n\
+March 17, 2005\n\
 \n\
 Usage Of Content\n\
 \n\
@@ -72,13 +72,17 @@
 repository ("Repository") in CVS modules ("Modules") and made available\n\
 as downloadable archives ("Downloads").\n\
 \n\
-Content may be apportioned into plug-ins ("Plug-ins"), plug-in fragments\n\
-("Fragments"), and features ("Features"). A Feature is a bundle of one or\n\
-more Plug-ins and/or Fragments and associated material. Files named\n\
-"feature.xml" may contain a list of the names and version numbers of the\n\
-Plug-ins and/or Fragments associated with a Feature. Plug-ins and Fragments\n\
-are located in directories named "plugins" and Features are located in\n\
-directories named "features".\n\
+   - Content may be structured and packaged into modules to facilitate delivering,\n\
+     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
+     plug-in fragments ("Fragments"), and features ("Features").\n\
+   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
+     in a directory named "plugins".\n\
+   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
+     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
+     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
+     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
+   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
+     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
 \n\
 Features may also include other Features ("Included Features"). Files named\n\
 "feature.xml" may contain a list of the names and version numbers of\n\
@@ -93,7 +97,8 @@
 \n\
    - The top-level (root) directory\n\
    - Plug-in and Fragment directories\n\
-   - Subdirectories of the directory named "src" of certain Plug-ins\n\
+   - Inside Plug-ins and Fragments packaged as JARs\n\
+   - Sub-directories of the directory named "src" of certain Plug-ins\n\
    - Feature directories\n\
 \n\
 Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
@@ -108,7 +113,7 @@
 use of the associated Content in that directory.\n\
 \n\
 THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE CPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
+TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
 SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
 \n\
     - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
@@ -130,7 +135,9 @@
 and/or re-export to another country, of encryption software. BEFORE\n\
 using any encryption software, please check the country's laws,\n\
 regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n
+and re-export of encryption software, to see if this is permitted.\n\
+\n\
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
 ########### end of license property ##########################################
 
 # ==============================================================================