diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties index c8275c811f8..4e57fbe9968 100644 --- a/rse/features/org.eclipse.rse.core-feature/feature.properties +++ b/rse/features/org.eclipse.rse.core-feature/feature.properties @@ -76,7 +76,7 @@ as downloadable archives ("Downloads").\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\ + - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) 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\ diff --git a/rse/features/org.eclipse.rse.core-feature/license.html b/rse/features/org.eclipse.rse.core-feature/license.html index c6af966b61e..b470189f51c 100644 --- a/rse/features/org.eclipse.rse.core-feature/license.html +++ b/rse/features/org.eclipse.rse.core-feature/license.html @@ -21,8 +21,8 @@

Applicable Licenses

Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 - ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. - For purposes of the EPL, "Program" will mean the Content.

+("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. +For purposes of the EPL, "Program" will mean the Content.

Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository ("Repository") in CVS modules ("Modules") and made available as downloadable archives ("Downloads").

@@ -38,15 +38,16 @@

The terms and conditions governing Plug-ins and Fragments should be contained in files named "about.html" ("Abouts"). The terms and conditions governing Features and Included Features should be contained in files named "license.html" ("Feature Licenses"). Abouts and Feature Licenses may be located in any directory of a Download or Module including, but not limited to the following locations:

- + - +

Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license ("Feature Update License") during the installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or inform you where you can locate them. Feature Update Licenses may be found in the "license" property of files named "feature.properties" found within a Feature. @@ -62,6 +63,7 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

  • Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)
  • IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)
  • Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)
    • +
  • Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)
    • @@ -69,9 +71,9 @@ OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):

    contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.

    Cryptography

    - +

    Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to - another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, + another country, of encryption software. BEFORE using any encryption software, please check the country’s laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.

    Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.