--- a/hotspot/src/share/vm/prims/jvmti.xml Thu May 27 12:42:44 2010 -0700
+++ b/hotspot/src/share/vm/prims/jvmti.xml Thu May 27 19:08:38 2010 -0700
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="jvmti.xsl"?>
<!--
- Copyright 2002-2006 Sun Microsystems, Inc. All Rights Reserved.
+ Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
This code is free software; you can redistribute it and/or modify it
@@ -18,9 +18,9 @@
2 along with this work; if not, write to the Free Software Foundation,
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- CA 95054 USA or visit www.sun.com if you need additional information or
- have any questions.
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
-->
@@ -818,8 +818,8 @@
</ul>
<p/>
Sun, Sun Microsystems, the Sun logo, Java, and JVM
- are trademarks or registered trademarks of Sun
- Microsystems, Inc. in the U.S. and other countries.
+ are trademarks or registered trademarks of Oracle
+ and/or its affiliates, in the U.S. and other countries.
</intro>