From 217ecfd8bab336603d6be5e16113867e1dd7ad1b Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 10 Nov 2006 07:23:06 +0000
Subject: [PATCH] Remove SSH trademarks as per Janets advice

---
 rse/features/org.eclipse.rse.ssh-feature/feature.properties   | 3 +--
 rse/features/org.eclipse.rse.ssh-feature/license.html         | 3 +--
 .../sourceTemplatePlugin/about.html                           | 4 ----
 rse/plugins/org.eclipse.rse.connectorservice.ssh/about.html   | 4 ----
 rse/plugins/org.eclipse.rse.services.ssh/about.html           | 4 ----
 rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html   | 4 ----
 rse/plugins/org.eclipse.rse.subsystems.shells.ssh/about.html  | 4 ----
 7 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.properties b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
index a3080e3e3d7..fc755dcb166 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.properties
@@ -138,6 +138,5 @@ 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\
-SSH is a registered trademark and Secure Shell is a trademark of SSH Communications Security Corp (http://www.ssh.com).\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/rse/features/org.eclipse.rse.ssh-feature/license.html b/rse/features/org.eclipse.rse.ssh-feature/license.html
index 9103d644d59..c6af966b61e 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/license.html
+++ b/rse/features/org.eclipse.rse.ssh-feature/license.html
@@ -74,7 +74,6 @@ 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><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>
+<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>   
 </body>
 </html>
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 867be11aed4..23d575ceea9 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.html
+++ b/rse/features/org.eclipse.rse.ssh-feature/sourceTemplatePlugin/about.html
@@ -29,9 +29,5 @@ and such source code may be obtained at <a href="http://www.eclipse.org">http://
 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
diff --git a/rse/plugins/org.eclipse.rse.connectorservice.ssh/about.html b/rse/plugins/org.eclipse.rse.connectorservice.ssh/about.html
index e773f609cbd..460233046ee 100644
--- a/rse/plugins/org.eclipse.rse.connectorservice.ssh/about.html
+++ b/rse/plugins/org.eclipse.rse.connectorservice.ssh/about.html
@@ -24,9 +24,5 @@ provided with the Content.  If no such license exists, contact the Redistributor
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
 
-<h2>Trademarks</h2>
-<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
diff --git a/rse/plugins/org.eclipse.rse.services.ssh/about.html b/rse/plugins/org.eclipse.rse.services.ssh/about.html
index e773f609cbd..460233046ee 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/about.html
+++ b/rse/plugins/org.eclipse.rse.services.ssh/about.html
@@ -24,9 +24,5 @@ provided with the Content.  If no such license exists, contact the Redistributor
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
 
-<h2>Trademarks</h2>
-<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
diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html
index e773f609cbd..460233046ee 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html
+++ b/rse/plugins/org.eclipse.rse.subsystems.files.ssh/about.html
@@ -24,9 +24,5 @@ provided with the Content.  If no such license exists, contact the Redistributor
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
 
-<h2>Trademarks</h2>
-<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
diff --git a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/about.html b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/about.html
index e773f609cbd..460233046ee 100644
--- a/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/about.html
+++ b/rse/plugins/org.eclipse.rse.subsystems.shells.ssh/about.html
@@ -24,9 +24,5 @@ provided with the Content.  If no such license exists, contact the Redistributor
 indicated below, the terms and conditions of the EPL still apply to any source code in the Content
 and such source code may be obtained at <a href="http://www.eclipse.org">http://www.eclipse.org</a>.</p>
 
-<h2>Trademarks</h2>
-<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