From eaf0f5d83e7f3367c4da01b6cc869f98d5575850 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Wed, 17 May 2006 08:55:36 +0000
Subject: [PATCH] Remove SSH Service dependency on UI. Update Manifest. Polish
 About.

---
 rse/features/org.eclipse.rse.ssh-feature/feature.properties  | 5 +++--
 rse/features/org.eclipse.rse.ssh-feature/feature.xml         | 1 -
 rse/features/org.eclipse.rse.ssh-feature/license.html        | 3 ++-
 .../sourceTemplateFeature/feature.properties                 | 2 +-
 .../sourceTemplatePlugin/about.html                          | 4 ++++
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
index dc785ce2ce0..de851b66504 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
@@ -24,7 +24,7 @@ providerName=Eclipse.org
 updateSiteName=Eclipse.org update site
 
 # "description" property - description of the feature
-description=The Remote System Explorer (RSE) stp contains an SSH-based \
+description=An SSH-based \
 implementation of the file ans shell services defined by the RSE API.
 
 # "licenseURL" property - URL of the "Feature License"
@@ -129,5 +129,6 @@ 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\
 \n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
+Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n\
+SSH is a registered trademark and Secure Shell is a trademark of SSH Communications Security Corp (http://www.ssh.com).\n
 ########### end of license property ##########################################
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index 86baa7e7232..ef3513dbfd4 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -28,7 +28,6 @@
       <import plugin="org.eclipse.team.cvs.ssh2"/>
       <import plugin="org.eclipse.rse.core"/>
       <import plugin="org.eclipse.rse.ui"/>
-      <import plugin="org.eclipse.team.cvs.ssh"/>
       <import plugin="org.eclipse.rse.subsystems.files.core"/>
       <import plugin="org.eclipse.rse.subsystems.shells.core"/>
    </requires>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/license.html b/rse/features/org.eclipse.rse.ssh-feature/license.html
index c6af966b61e..9103d644d59 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/license.html
+++ b/rse/features/org.eclipse.rse.ssh-feature/license.html
@@ -74,6 +74,7 @@ contact the Eclipse Foundation to determine what terms and conditions govern tha
    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.</p>
    
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small><br/>
+<small>SSH is a registered trademark and Secure Shell is a trademark of SSH Communications Security Corp (<a href="http://www.ssh.com">http://www.ssh.com</a>).</small>
 </body>
 </html>
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
index 50694569b0b..557c36107c1 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplateFeature/feature.properties
@@ -24,7 +24,7 @@ providerName=Eclipse.org
 updateSiteName=Eclipse.org update site
 
 # "description" property - description of the feature
-description=The Remote System Explorer (RSE) stp contains an SSH-based \
+description=An SSH-based \
 implementation of the file and shell services defined by the RSE API.
 
 # "licenseURL" property - URL of the "Feature License"
diff --git a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.html b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.html
index 02c4b50b651..5cedd8959bb 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.html
+++ b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.html
@@ -28,5 +28,9 @@ and such source code may be obtained at <a href="/">http://www.eclipse.org</a>.<
 agreements and/or notices. Details about these license agreements and notices are contained in &quot;about.html&quot; files (&quot;Abouts&quot;) located in sub-directories in the
 src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
 
+<h3>Trademarks</h3>
+<p>SSH is a registered trademark and Secure Shell is a trademark of 
+SSH Communications Security Corp (<a href="http://www.ssh.com">http://www.ssh.com</a>)</p>
+
 </body>
 </html>
\ No newline at end of file