Author: funkman
Date: Mon Aug 23 11:35:27 2010
New Revision: 988079
URL: http://svn.apache.org/viewvc?rev=988079&view=rev
Log:
s/Sun Microsystems, Inc/Oracle Corporation/
Modified:
tomcat/site/trunk/docs/legal.html
tomcat/site/trunk/xdocs/legal.xml
Modified: tomcat/site/trunk/docs/legal.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/legal.html?rev=988079&r1=988078&r2=988079&view=diff
==============================================================================
--- tomcat/site/trunk/docs/legal.html (original)
+++ tomcat/site/trunk/docs/legal.html Mon Aug 23 11:35:27 2010
@@ -204,8 +204,8 @@ Software Foundation
<p>
Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit,
-and JavaServer Pages are trademarks or registered trademarks of Sun
-Microsystems, Inc. UNIX is a registered trademark in the United States
+and JavaServer Pages are trademarks or registered trademarks of Oracle
+Corporation. UNIX is a registered trademark in the United States
and other countries, exclusively licensed through 'The Open Group'.
Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of
Microsoft Corporation. Linux is a registered trademark of Linus Torvalds.
Modified: tomcat/site/trunk/xdocs/legal.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/legal.xml?rev=988079&r1=988078&r2=988079&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/legal.xml (original)
+++ tomcat/site/trunk/xdocs/legal.xml Mon Aug 23 11:35:27 2010
@@ -17,8 +17,8 @@ Software Foundation
<p>
Sun, Sun Microsystems, Solaris, Java, JavaServer Web Development Kit,
-and JavaServer Pages are trademarks or registered trademarks of Sun
-Microsystems, Inc. UNIX is a registered trademark in the United States
+and JavaServer Pages are trademarks or registered trademarks of Oracle
+Corporation. UNIX is a registered trademark in the United States
and other countries, exclusively licensed through 'The Open Group'.
Microsoft, Windows, WindowsNT, and Win32 are registered trademarks of
Microsoft Corporation. Linux is a registered trademark of Linus Torvalds.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
