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