From b210c661bedde420746682a9b23352eb27bb6474 Mon Sep 17 00:00:00 2001
From: ohair <none@none>
Date: Wed, 26 May 2010 20:28:04 -0700
Subject: 6956202: Fix a few missed rebranding issues, please contact lines
 etc. Reviewed-by: jjg, darcy, weijun

---
 src/share/classes/com/sun/jarsigner/package.html                    | 6 +++---
 src/share/classes/com/sun/java/util/jar/pack/package.html           | 6 +++---
 src/share/classes/com/sun/jdi/connect/package.html                  | 6 +++---
 src/share/classes/com/sun/jdi/connect/spi/package.html              | 6 +++---
 src/share/classes/com/sun/jdi/event/package.html                    | 6 +++---
 src/share/classes/com/sun/jdi/package.html                          | 6 +++---
 src/share/classes/com/sun/jdi/request/package.html                  | 6 +++---
 src/share/classes/com/sun/jmx/defaults/package.html                 | 6 +++---
 src/share/classes/com/sun/jmx/interceptor/package.html              | 6 +++---
 src/share/classes/com/sun/jmx/mbeanserver/package.html              | 6 +++---
 src/share/classes/com/sun/jmx/remote/internal/package.html          | 6 +++---
 src/share/classes/com/sun/jmx/snmp/IPAcl/package.html               | 6 +++---
 src/share/classes/com/sun/jmx/snmp/agent/package.html               | 6 +++---
 src/share/classes/com/sun/jmx/snmp/daemon/package.html              | 6 +++---
 src/share/classes/com/sun/jmx/snmp/defaults/package.html            | 6 +++---
 src/share/classes/com/sun/jmx/snmp/internal/package.html            | 6 +++---
 src/share/classes/com/sun/jmx/snmp/mpm/package.html                 | 6 +++---
 src/share/classes/com/sun/jmx/snmp/package.html                     | 6 +++---
 src/share/classes/com/sun/jmx/snmp/tasks/package.html               | 6 +++---
 src/share/classes/com/sun/management/mgmt-overview.html             | 6 +++---
 src/share/classes/com/sun/management/package.html                   | 6 +++---
 src/share/classes/com/sun/net/ssl/package.html                      | 6 +++---
 src/share/classes/com/sun/rowset/providers/package.html             | 6 +++---
 src/share/classes/com/sun/servicetag/package.html                   | 6 +++---
 src/share/classes/com/sun/servicetag/resources/register.html        | 6 +++---
 src/share/classes/com/sun/servicetag/resources/register_ja.html     | 6 +++---
 src/share/classes/com/sun/servicetag/resources/register_zh_CN.html  | 6 +++---
 src/share/classes/com/sun/tools/hat/resources/oqlhelp.html          | 6 +++---
 src/share/classes/java/security/acl/package.html                    | 6 +++---
 src/share/classes/java/security/package.html                        | 6 +++---
 src/share/classes/java/security/spec/package.html                   | 6 +++---
 src/share/classes/java/sql/package.html                             | 6 +++---
 src/share/classes/java/text/package.html                            | 6 +++---
 src/share/classes/java/text/spi/package.html                        | 6 +++---
 src/share/classes/java/util/jar/package.html                        | 6 +++---
 src/share/classes/java/util/logging/package.html                    | 6 +++---
 src/share/classes/java/util/package.html                            | 6 +++---
 src/share/classes/java/util/prefs/package.html                      | 6 +++---
 src/share/classes/java/util/regex/package.html                      | 6 +++---
 src/share/classes/java/util/spi/package.html                        | 6 +++---
 src/share/classes/java/util/zip/package.html                        | 6 +++---
 src/share/classes/javax/accessibility/package.html                  | 6 +++---
 src/share/classes/javax/crypto/interfaces/package.html              | 6 +++---
 src/share/classes/javax/crypto/package.html                         | 6 +++---
 src/share/classes/javax/crypto/spec/package.html                    | 6 +++---
 src/share/classes/javax/imageio/event/package.html                  | 6 +++---
 .../classes/javax/imageio/metadata/doc-files/bmp_metadata.html      | 6 +++---
 .../classes/javax/imageio/metadata/doc-files/gif_metadata.html      | 6 +++---
 .../classes/javax/imageio/metadata/doc-files/jpeg_metadata.html     | 6 +++---
 .../classes/javax/imageio/metadata/doc-files/png_metadata.html      | 6 +++---
 .../classes/javax/imageio/metadata/doc-files/standard_metadata.html | 6 +++---
 .../classes/javax/imageio/metadata/doc-files/wbmp_metadata.html     | 6 +++---
 src/share/classes/javax/imageio/metadata/package.html               | 6 +++---
 src/share/classes/javax/imageio/package.html                        | 6 +++---
 src/share/classes/javax/imageio/plugins/bmp/package.html            | 6 +++---
 src/share/classes/javax/imageio/plugins/jpeg/package.html           | 6 +++---
 src/share/classes/javax/imageio/spi/package.html                    | 6 +++---
 src/share/classes/javax/imageio/stream/package.html                 | 6 +++---
 src/share/classes/javax/management/build.xml                        | 2 +-
 src/share/classes/javax/management/loading/package.html             | 6 +++---
 src/share/classes/javax/management/modelmbean/package.html          | 6 +++---
 src/share/classes/javax/management/monitor/package.html             | 6 +++---
 src/share/classes/javax/management/openmbean/package.html           | 6 +++---
 src/share/classes/javax/management/package.html                     | 6 +++---
 src/share/classes/javax/management/relation/package.html            | 6 +++---
 src/share/classes/javax/management/remote/package.html              | 6 +++---
 src/share/classes/javax/management/remote/rmi/package.html          | 6 +++---
 src/share/classes/javax/management/timer/package.html               | 6 +++---
 src/share/classes/javax/naming/directory/package.html               | 6 +++---
 src/share/classes/javax/naming/event/package.html                   | 6 +++---
 src/share/classes/javax/naming/ldap/package.html                    | 6 +++---
 src/share/classes/javax/naming/package.html                         | 6 +++---
 src/share/classes/javax/naming/spi/package.html                     | 6 +++---
 src/share/classes/javax/net/package.html                            | 6 +++---
 src/share/classes/javax/net/ssl/package.html                        | 6 +++---
 src/share/classes/javax/print/attribute/package.html                | 6 +++---
 src/share/classes/javax/print/attribute/standard/package.html       | 6 +++---
 src/share/classes/javax/print/event/package.html                    | 6 +++---
 src/share/classes/javax/print/package.html                          | 6 +++---
 src/share/classes/javax/rmi/ssl/package.html                        | 6 +++---
 src/share/classes/javax/script/package.html                         | 6 +++---
 src/share/classes/javax/security/auth/callback/package.html         | 6 +++---
 src/share/classes/javax/security/auth/kerberos/package.html         | 6 +++---
 src/share/classes/javax/security/auth/login/package.html            | 6 +++---
 src/share/classes/javax/security/auth/package.html                  | 6 +++---
 src/share/classes/javax/security/auth/spi/package.html              | 6 +++---
 src/share/classes/javax/security/auth/x500/package.html             | 6 +++---
 src/share/classes/javax/security/cert/package.html                  | 6 +++---
 src/share/classes/javax/security/sasl/package.html                  | 6 +++---
 src/share/classes/javax/sound/midi/package.html                     | 6 +++---
 src/share/classes/javax/sound/midi/spi/package.html                 | 6 +++---
 src/share/classes/javax/sound/sampled/package.html                  | 6 +++---
 src/share/classes/javax/sound/sampled/spi/package.html              | 6 +++---
 src/share/classes/javax/sql/package.html                            | 6 +++---
 src/share/classes/javax/sql/rowset/package.html                     | 6 +++---
 src/share/classes/javax/sql/rowset/serial/package.html              | 6 +++---
 src/share/classes/javax/sql/rowset/spi/package.html                 | 6 +++---
 src/share/classes/javax/swing/border/package.html                   | 6 +++---
 src/share/classes/javax/swing/colorchooser/package.html             | 6 +++---
 src/share/classes/javax/swing/event/package.html                    | 6 +++---
 src/share/classes/javax/swing/filechooser/package.html              | 6 +++---
 src/share/classes/javax/swing/package.html                          | 6 +++---
 src/share/classes/javax/swing/plaf/basic/package.html               | 6 +++---
 src/share/classes/javax/swing/plaf/metal/package.html               | 6 +++---
 src/share/classes/javax/swing/plaf/multi/package.html               | 6 +++---
 src/share/classes/javax/swing/plaf/nimbus/package.html              | 6 +++---
 src/share/classes/javax/swing/plaf/package.html                     | 6 +++---
 .../javax/swing/plaf/synth/doc-files/componentProperties.html       | 6 +++---
 src/share/classes/javax/swing/plaf/synth/package.html               | 6 +++---
 src/share/classes/javax/swing/table/package.html                    | 6 +++---
 src/share/classes/javax/swing/text/html/package.html                | 6 +++---
 src/share/classes/javax/swing/text/html/parser/package.html         | 6 +++---
 src/share/classes/javax/swing/text/package.html                     | 6 +++---
 src/share/classes/javax/swing/text/rtf/package.html                 | 6 +++---
 src/share/classes/javax/swing/tree/package.html                     | 6 +++---
 src/share/classes/javax/swing/undo/package.html                     | 6 +++---
 src/share/classes/javax/xml/crypto/dom/package.html                 | 6 +++---
 src/share/classes/javax/xml/crypto/dsig/dom/package.html            | 6 +++---
 src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html        | 6 +++---
 src/share/classes/javax/xml/crypto/dsig/package.html                | 6 +++---
 src/share/classes/javax/xml/crypto/dsig/spec/package.html           | 6 +++---
 src/share/classes/javax/xml/crypto/package.html                     | 6 +++---
 src/share/classes/org/ietf/jgss/package.html                        | 6 +++---
 src/share/classes/overview-core.html                                | 6 +++---
 124 files changed, 370 insertions(+), 370 deletions(-)

(limited to 'src/share')

diff --git a/src/share/classes/com/sun/jarsigner/package.html b/src/share/classes/com/sun/jarsigner/package.html
index 80a84aa5a..b00d655d9 100644
--- a/src/share/classes/com/sun/jarsigner/package.html
+++ b/src/share/classes/com/sun/jarsigner/package.html
@@ -20,9 +20,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
   <head>
     <title>Jarsigner Signing Mechanism Package</title>
diff --git a/src/share/classes/com/sun/java/util/jar/pack/package.html b/src/share/classes/com/sun/java/util/jar/pack/package.html
index bdc521d15..084e0df7e 100644
--- a/src/share/classes/com/sun/java/util/jar/pack/package.html
+++ b/src/share/classes/com/sun/java/util/jar/pack/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jdi/connect/package.html b/src/share/classes/com/sun/jdi/connect/package.html
index c623891bb..7484ce2ca 100644
--- a/src/share/classes/com/sun/jdi/connect/package.html
+++ b/src/share/classes/com/sun/jdi/connect/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jdi/connect/spi/package.html b/src/share/classes/com/sun/jdi/connect/spi/package.html
index b21d2fe6b..29f98ede1 100644
--- a/src/share/classes/com/sun/jdi/connect/spi/package.html
+++ b/src/share/classes/com/sun/jdi/connect/spi/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jdi/event/package.html b/src/share/classes/com/sun/jdi/event/package.html
index 922aeb45a..521a8b7c8 100644
--- a/src/share/classes/com/sun/jdi/event/package.html
+++ b/src/share/classes/com/sun/jdi/event/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jdi/package.html b/src/share/classes/com/sun/jdi/package.html
index 3c8f89e55..5aee603d9 100644
--- a/src/share/classes/com/sun/jdi/package.html
+++ b/src/share/classes/com/sun/jdi/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jdi/request/package.html b/src/share/classes/com/sun/jdi/request/package.html
index b56bd71ea..c99c1c8e3 100644
--- a/src/share/classes/com/sun/jdi/request/package.html
+++ b/src/share/classes/com/sun/jdi/request/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jmx/defaults/package.html b/src/share/classes/com/sun/jmx/defaults/package.html
index 66600e3d4..273fafd9d 100644
--- a/src/share/classes/com/sun/jmx/defaults/package.html
+++ b/src/share/classes/com/sun/jmx/defaults/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jmx/interceptor/package.html b/src/share/classes/com/sun/jmx/interceptor/package.html
index 0e79aaca6..f68908255 100644
--- a/src/share/classes/com/sun/jmx/interceptor/package.html
+++ b/src/share/classes/com/sun/jmx/interceptor/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jmx/mbeanserver/package.html b/src/share/classes/com/sun/jmx/mbeanserver/package.html
index fc15bd1df..d2068992d 100644
--- a/src/share/classes/com/sun/jmx/mbeanserver/package.html
+++ b/src/share/classes/com/sun/jmx/mbeanserver/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jmx/remote/internal/package.html b/src/share/classes/com/sun/jmx/remote/internal/package.html
index 2b0f6915f..134840fd5 100644
--- a/src/share/classes/com/sun/jmx/remote/internal/package.html
+++ b/src/share/classes/com/sun/jmx/remote/internal/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html b/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html
index 9d9586086..c3a9a1d14 100644
--- a/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/jmx/snmp/agent/package.html b/src/share/classes/com/sun/jmx/snmp/agent/package.html
index 53196012a..0eca90054 100644
--- a/src/share/classes/com/sun/jmx/snmp/agent/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/agent/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/jmx/snmp/daemon/package.html b/src/share/classes/com/sun/jmx/snmp/daemon/package.html
index 9cc9b0aa5..353587f75 100644
--- a/src/share/classes/com/sun/jmx/snmp/daemon/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/daemon/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/jmx/snmp/defaults/package.html b/src/share/classes/com/sun/jmx/snmp/defaults/package.html
index 3b1093d94..2305ad199 100644
--- a/src/share/classes/com/sun/jmx/snmp/defaults/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/defaults/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/jmx/snmp/internal/package.html b/src/share/classes/com/sun/jmx/snmp/internal/package.html
index fa1b4c5e1..ae5a26871 100644
--- a/src/share/classes/com/sun/jmx/snmp/internal/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/internal/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/jmx/snmp/mpm/package.html b/src/share/classes/com/sun/jmx/snmp/mpm/package.html
index e1e86ec51..a8eb1e4ca 100644
--- a/src/share/classes/com/sun/jmx/snmp/mpm/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/mpm/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/jmx/snmp/package.html b/src/share/classes/com/sun/jmx/snmp/package.html
index bf51fea24..cdef83dfa 100644
--- a/src/share/classes/com/sun/jmx/snmp/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/jmx/snmp/tasks/package.html b/src/share/classes/com/sun/jmx/snmp/tasks/package.html
index cc34d81ae..3e10a9d8f 100644
--- a/src/share/classes/com/sun/jmx/snmp/tasks/package.html
+++ b/src/share/classes/com/sun/jmx/snmp/tasks/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY>
diff --git a/src/share/classes/com/sun/management/mgmt-overview.html b/src/share/classes/com/sun/management/mgmt-overview.html
index 4e3b69801..7af4e92b7 100644
--- a/src/share/classes/com/sun/management/mgmt-overview.html
+++ b/src/share/classes/com/sun/management/mgmt-overview.html
@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
   </head>
diff --git a/src/share/classes/com/sun/management/package.html b/src/share/classes/com/sun/management/package.html
index 48a0575b1..b4c66900c 100644
--- a/src/share/classes/com/sun/management/package.html
+++ b/src/share/classes/com/sun/management/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/com/sun/net/ssl/package.html b/src/share/classes/com/sun/net/ssl/package.html
index e00ca5075..20352c2b1 100644
--- a/src/share/classes/com/sun/net/ssl/package.html
+++ b/src/share/classes/com/sun/net/ssl/package.html
@@ -23,9 +23,9 @@ You should have received a copy of the GNU General Public License version
 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.
 
 -->
 
diff --git a/src/share/classes/com/sun/rowset/providers/package.html b/src/share/classes/com/sun/rowset/providers/package.html
index 572d48c60..f75681fa7 100644
--- a/src/share/classes/com/sun/rowset/providers/package.html
+++ b/src/share/classes/com/sun/rowset/providers/package.html
@@ -28,9 +28,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
   <title>javax.sql.rowset.providers Package</title>
 </head>
diff --git a/src/share/classes/com/sun/servicetag/package.html b/src/share/classes/com/sun/servicetag/package.html
index 59d2e0fd7..8c7c90a11 100644
--- a/src/share/classes/com/sun/servicetag/package.html
+++ b/src/share/classes/com/sun/servicetag/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 
 -->
 
diff --git a/src/share/classes/com/sun/servicetag/resources/register.html b/src/share/classes/com/sun/servicetag/resources/register.html
index 263d73e8e..7684268eb 100644
--- a/src/share/classes/com/sun/servicetag/resources/register.html
+++ b/src/share/classes/com/sun/servicetag/resources/register.html
@@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <style type="text/css">
diff --git a/src/share/classes/com/sun/servicetag/resources/register_ja.html b/src/share/classes/com/sun/servicetag/resources/register_ja.html
index 6f82ec255..dae437712 100644
--- a/src/share/classes/com/sun/servicetag/resources/register_ja.html
+++ b/src/share/classes/com/sun/servicetag/resources/register_ja.html
@@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <style type="text/css">
diff --git a/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html b/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
index 744171ec4..dfc24dc94 100644
--- a/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
+++ b/src/share/classes/com/sun/servicetag/resources/register_zh_CN.html
@@ -25,9 +25,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <style type="text/css">
diff --git a/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html b/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html
index 5d82ea58e..3937f4a1c 100644
--- a/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html
+++ b/src/share/classes/com/sun/tools/hat/resources/oqlhelp.html
@@ -18,9 +18,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <html>
diff --git a/src/share/classes/java/security/acl/package.html b/src/share/classes/java/security/acl/package.html
index 34491ebcd..497dfe832 100644
--- a/src/share/classes/java/security/acl/package.html
+++ b/src/share/classes/java/security/acl/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/security/package.html b/src/share/classes/java/security/package.html
index eb28818de..ded6e7fb5 100644
--- a/src/share/classes/java/security/package.html
+++ b/src/share/classes/java/security/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/security/spec/package.html b/src/share/classes/java/security/spec/package.html
index e90b234a6..54558ae19 100644
--- a/src/share/classes/java/security/spec/package.html
+++ b/src/share/classes/java/security/spec/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/sql/package.html b/src/share/classes/java/sql/package.html
index b1fe77646..88718c85d 100644
--- a/src/share/classes/java/sql/package.html
+++ b/src/share/classes/java/sql/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/text/package.html b/src/share/classes/java/text/package.html
index d4de8ce3c..a8b0397b3 100644
--- a/src/share/classes/java/text/package.html
+++ b/src/share/classes/java/text/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/text/spi/package.html b/src/share/classes/java/text/spi/package.html
index b49c8508d..fa08ec1fb 100644
--- a/src/share/classes/java/text/spi/package.html
+++ b/src/share/classes/java/text/spi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/util/jar/package.html b/src/share/classes/java/util/jar/package.html
index 63dc90ad2..dd9ad7377 100644
--- a/src/share/classes/java/util/jar/package.html
+++ b/src/share/classes/java/util/jar/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/util/logging/package.html b/src/share/classes/java/util/logging/package.html
index 747d9dbbb..cafcdad3f 100644
--- a/src/share/classes/java/util/logging/package.html
+++ b/src/share/classes/java/util/logging/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/util/package.html b/src/share/classes/java/util/package.html
index 4d81bc618..a65593443 100644
--- a/src/share/classes/java/util/package.html
+++ b/src/share/classes/java/util/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/util/prefs/package.html b/src/share/classes/java/util/prefs/package.html
index b3b7a1bf7..f3160b356 100644
--- a/src/share/classes/java/util/prefs/package.html
+++ b/src/share/classes/java/util/prefs/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/util/regex/package.html b/src/share/classes/java/util/regex/package.html
index 76df1d918..5be2f0bcc 100644
--- a/src/share/classes/java/util/regex/package.html
+++ b/src/share/classes/java/util/regex/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/util/spi/package.html b/src/share/classes/java/util/spi/package.html
index 2271042c7..ce49fb2a4 100644
--- a/src/share/classes/java/util/spi/package.html
+++ b/src/share/classes/java/util/spi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/java/util/zip/package.html b/src/share/classes/java/util/zip/package.html
index eb9966eb7..9365f15f0 100644
--- a/src/share/classes/java/util/zip/package.html
+++ b/src/share/classes/java/util/zip/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/accessibility/package.html b/src/share/classes/javax/accessibility/package.html
index 65fff0afe..bec59cf09 100644
--- a/src/share/classes/javax/accessibility/package.html
+++ b/src/share/classes/javax/accessibility/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </HEAD>
 <BODY BGCOLOR="#FFFFFF">
diff --git a/src/share/classes/javax/crypto/interfaces/package.html b/src/share/classes/javax/crypto/interfaces/package.html
index 3ad7059a4..8b18ce2df 100644
--- a/src/share/classes/javax/crypto/interfaces/package.html
+++ b/src/share/classes/javax/crypto/interfaces/package.html
@@ -18,9 +18,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
diff --git a/src/share/classes/javax/crypto/package.html b/src/share/classes/javax/crypto/package.html
index 1d51ed525..e63e4c885 100644
--- a/src/share/classes/javax/crypto/package.html
+++ b/src/share/classes/javax/crypto/package.html
@@ -18,9 +18,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
diff --git a/src/share/classes/javax/crypto/spec/package.html b/src/share/classes/javax/crypto/spec/package.html
index 9cce0041b..b8fd80724 100644
--- a/src/share/classes/javax/crypto/spec/package.html
+++ b/src/share/classes/javax/crypto/spec/package.html
@@ -18,9 +18,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
diff --git a/src/share/classes/javax/imageio/event/package.html b/src/share/classes/javax/imageio/event/package.html
index e65bb69eb..000ab8bde 100644
--- a/src/share/classes/javax/imageio/event/package.html
+++ b/src/share/classes/javax/imageio/event/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
index d6bc0b998..9e1f9d0ba 100644
--- a/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/bmp_metadata.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <title>BMP Metadata Format Specification</title>
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
index 57b9faa5e..e7374ea24 100644
--- a/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/gif_metadata.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <title>GIF Metadata Format Specification</title>
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
index 0b16c376d..721bdb2e7 100644
--- a/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/jpeg_metadata.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <title>JPEG Metadata Format Specification and Usage Notes</title>
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
index 4fc29cd31..11dce0114 100644
--- a/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/png_metadata.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <title>PNG Metadata Format Specification</title>
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
index a1209966e..2e515879e 100644
--- a/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/standard_metadata.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <title>Standard Metadata Format Specification</title>
diff --git a/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html b/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
index a91bc870f..de406564b 100644
--- a/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
+++ b/src/share/classes/javax/imageio/metadata/doc-files/wbmp_metadata.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 <title>WBMP Metadata Format Specification</title>
diff --git a/src/share/classes/javax/imageio/metadata/package.html b/src/share/classes/javax/imageio/metadata/package.html
index 7c5468130..8fc6561d6 100644
--- a/src/share/classes/javax/imageio/metadata/package.html
+++ b/src/share/classes/javax/imageio/metadata/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/imageio/package.html b/src/share/classes/javax/imageio/package.html
index 90a08d9a5..f0927fa14 100644
--- a/src/share/classes/javax/imageio/package.html
+++ b/src/share/classes/javax/imageio/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/imageio/plugins/bmp/package.html b/src/share/classes/javax/imageio/plugins/bmp/package.html
index 1b02a8f6c..36467da7f 100644
--- a/src/share/classes/javax/imageio/plugins/bmp/package.html
+++ b/src/share/classes/javax/imageio/plugins/bmp/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/imageio/plugins/jpeg/package.html b/src/share/classes/javax/imageio/plugins/jpeg/package.html
index 601c449da..60d4e8eea 100644
--- a/src/share/classes/javax/imageio/plugins/jpeg/package.html
+++ b/src/share/classes/javax/imageio/plugins/jpeg/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/imageio/spi/package.html b/src/share/classes/javax/imageio/spi/package.html
index 35316e5e3..20170bd8d 100644
--- a/src/share/classes/javax/imageio/spi/package.html
+++ b/src/share/classes/javax/imageio/spi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/imageio/stream/package.html b/src/share/classes/javax/imageio/stream/package.html
index cad343d6b..41f84b8fb 100644
--- a/src/share/classes/javax/imageio/stream/package.html
+++ b/src/share/classes/javax/imageio/stream/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/management/build.xml b/src/share/classes/javax/management/build.xml
index f8114a6c4..24357d694 100644
--- a/src/share/classes/javax/management/build.xml
+++ b/src/share/classes/javax/management/build.xml
@@ -51,7 +51,7 @@
      -->
 
     <description>
-	Copyright 2006 Sun Microsystems, Inc.  All rights reserved. Use is subject to license terms.
+        Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
 
         Description: JMX API Version 1.4 - Source Code from Java SE 6
     </description>
diff --git a/src/share/classes/javax/management/loading/package.html b/src/share/classes/javax/management/loading/package.html
index 873c47a9a..7b7ca68a9 100644
--- a/src/share/classes/javax/management/loading/package.html
+++ b/src/share/classes/javax/management/loading/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/management/modelmbean/package.html b/src/share/classes/javax/management/modelmbean/package.html
index 6385ae7a1..28aecab1b 100644
--- a/src/share/classes/javax/management/modelmbean/package.html
+++ b/src/share/classes/javax/management/modelmbean/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/management/monitor/package.html b/src/share/classes/javax/management/monitor/package.html
index 10ac0cebf..70813bade 100644
--- a/src/share/classes/javax/management/monitor/package.html
+++ b/src/share/classes/javax/management/monitor/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/management/openmbean/package.html b/src/share/classes/javax/management/openmbean/package.html
index 6ee323ba5..5e11992fc 100644
--- a/src/share/classes/javax/management/openmbean/package.html
+++ b/src/share/classes/javax/management/openmbean/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/management/package.html b/src/share/classes/javax/management/package.html
index c80812905..2f10817e1 100644
--- a/src/share/classes/javax/management/package.html
+++ b/src/share/classes/javax/management/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
         -->
     </head>
     <body bgcolor="white">
diff --git a/src/share/classes/javax/management/relation/package.html b/src/share/classes/javax/management/relation/package.html
index 36939f8f1..c5908423d 100644
--- a/src/share/classes/javax/management/relation/package.html
+++ b/src/share/classes/javax/management/relation/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/management/remote/package.html b/src/share/classes/javax/management/remote/package.html
index 17660937c..e21a22289 100644
--- a/src/share/classes/javax/management/remote/package.html
+++ b/src/share/classes/javax/management/remote/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/management/remote/rmi/package.html b/src/share/classes/javax/management/remote/rmi/package.html
index a405095b0..a0a1725ac 100644
--- a/src/share/classes/javax/management/remote/rmi/package.html
+++ b/src/share/classes/javax/management/remote/rmi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/management/timer/package.html b/src/share/classes/javax/management/timer/package.html
index 40036e5c6..a1cada0e3 100644
--- a/src/share/classes/javax/management/timer/package.html
+++ b/src/share/classes/javax/management/timer/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/naming/directory/package.html b/src/share/classes/javax/naming/directory/package.html
index 0d5ec4a12..732cb2310 100644
--- a/src/share/classes/javax/naming/directory/package.html
+++ b/src/share/classes/javax/naming/directory/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/naming/event/package.html b/src/share/classes/javax/naming/event/package.html
index 9d168bac8..f23dbe887 100644
--- a/src/share/classes/javax/naming/event/package.html
+++ b/src/share/classes/javax/naming/event/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/naming/ldap/package.html b/src/share/classes/javax/naming/ldap/package.html
index 7749d2d62..79e550628 100644
--- a/src/share/classes/javax/naming/ldap/package.html
+++ b/src/share/classes/javax/naming/ldap/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
  
 -->
 </head>
diff --git a/src/share/classes/javax/naming/package.html b/src/share/classes/javax/naming/package.html
index edce19434..8011d089f 100644
--- a/src/share/classes/javax/naming/package.html
+++ b/src/share/classes/javax/naming/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/naming/spi/package.html b/src/share/classes/javax/naming/spi/package.html
index b1c28504a..4176930cb 100644
--- a/src/share/classes/javax/naming/spi/package.html
+++ b/src/share/classes/javax/naming/spi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/net/package.html b/src/share/classes/javax/net/package.html
index 5c81ef2b3..35845a183 100644
--- a/src/share/classes/javax/net/package.html
+++ b/src/share/classes/javax/net/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/net/ssl/package.html b/src/share/classes/javax/net/ssl/package.html
index cfbbaade7..0d05c48e9 100644
--- a/src/share/classes/javax/net/ssl/package.html
+++ b/src/share/classes/javax/net/ssl/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/print/attribute/package.html b/src/share/classes/javax/print/attribute/package.html
index 6f55c96ce..7c848c5b2 100644
--- a/src/share/classes/javax/print/attribute/package.html
+++ b/src/share/classes/javax/print/attribute/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/print/attribute/standard/package.html b/src/share/classes/javax/print/attribute/standard/package.html
index 24eed95f5..b71b72b79 100644
--- a/src/share/classes/javax/print/attribute/standard/package.html
+++ b/src/share/classes/javax/print/attribute/standard/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/print/event/package.html b/src/share/classes/javax/print/event/package.html
index 03e410f8a..4074b949c 100644
--- a/src/share/classes/javax/print/event/package.html
+++ b/src/share/classes/javax/print/event/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/print/package.html b/src/share/classes/javax/print/package.html
index ef61bc529..df8c04573 100644
--- a/src/share/classes/javax/print/package.html
+++ b/src/share/classes/javax/print/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/rmi/ssl/package.html b/src/share/classes/javax/rmi/ssl/package.html
index edae31de6..469345d14 100644
--- a/src/share/classes/javax/rmi/ssl/package.html
+++ b/src/share/classes/javax/rmi/ssl/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/script/package.html b/src/share/classes/javax/script/package.html
index 6a89f9588..fba783194 100644
--- a/src/share/classes/javax/script/package.html
+++ b/src/share/classes/javax/script/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/auth/callback/package.html b/src/share/classes/javax/security/auth/callback/package.html
index 5704f8376..66d58e4f0 100644
--- a/src/share/classes/javax/security/auth/callback/package.html
+++ b/src/share/classes/javax/security/auth/callback/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/auth/kerberos/package.html b/src/share/classes/javax/security/auth/kerberos/package.html
index 170ad3605..413f0ff28 100644
--- a/src/share/classes/javax/security/auth/kerberos/package.html
+++ b/src/share/classes/javax/security/auth/kerberos/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/auth/login/package.html b/src/share/classes/javax/security/auth/login/package.html
index 666627736..225fd6b8b 100644
--- a/src/share/classes/javax/security/auth/login/package.html
+++ b/src/share/classes/javax/security/auth/login/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/auth/package.html b/src/share/classes/javax/security/auth/package.html
index 4436200d8..dc8801f35 100644
--- a/src/share/classes/javax/security/auth/package.html
+++ b/src/share/classes/javax/security/auth/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/auth/spi/package.html b/src/share/classes/javax/security/auth/spi/package.html
index 8970955f7..f4ca707c0 100644
--- a/src/share/classes/javax/security/auth/spi/package.html
+++ b/src/share/classes/javax/security/auth/spi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/auth/x500/package.html b/src/share/classes/javax/security/auth/x500/package.html
index 7d3b9c7cd..508380fb2 100644
--- a/src/share/classes/javax/security/auth/x500/package.html
+++ b/src/share/classes/javax/security/auth/x500/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/cert/package.html b/src/share/classes/javax/security/cert/package.html
index bcbb44a35..06c25e0d1 100644
--- a/src/share/classes/javax/security/cert/package.html
+++ b/src/share/classes/javax/security/cert/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/security/sasl/package.html b/src/share/classes/javax/security/sasl/package.html
index 82672c3a2..cf497ebe3 100644
--- a/src/share/classes/javax/security/sasl/package.html
+++ b/src/share/classes/javax/security/sasl/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/sound/midi/package.html b/src/share/classes/javax/sound/midi/package.html
index db2c931ff..247e6f5fd 100644
--- a/src/share/classes/javax/sound/midi/package.html
+++ b/src/share/classes/javax/sound/midi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/sound/midi/spi/package.html b/src/share/classes/javax/sound/midi/spi/package.html
index 2ede38260..6101ded4c 100644
--- a/src/share/classes/javax/sound/midi/spi/package.html
+++ b/src/share/classes/javax/sound/midi/spi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/sound/sampled/package.html b/src/share/classes/javax/sound/sampled/package.html
index fb9fff6e3..f5c00c277 100644
--- a/src/share/classes/javax/sound/sampled/package.html
+++ b/src/share/classes/javax/sound/sampled/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/sound/sampled/spi/package.html b/src/share/classes/javax/sound/sampled/spi/package.html
index 76307862d..93db4a2a9 100644
--- a/src/share/classes/javax/sound/sampled/spi/package.html
+++ b/src/share/classes/javax/sound/sampled/spi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/sql/package.html b/src/share/classes/javax/sql/package.html
index 9476a9c5c..667fb03a7 100644
--- a/src/share/classes/javax/sql/package.html
+++ b/src/share/classes/javax/sql/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/sql/rowset/package.html b/src/share/classes/javax/sql/rowset/package.html
index decf3d1a7..41d00d565 100644
--- a/src/share/classes/javax/sql/rowset/package.html
+++ b/src/share/classes/javax/sql/rowset/package.html
@@ -24,9 +24,9 @@ You should have received a copy of the GNU General Public License version
 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.
 
 -->
   <title>javax.sql.rowset Package</title>
diff --git a/src/share/classes/javax/sql/rowset/serial/package.html b/src/share/classes/javax/sql/rowset/serial/package.html
index 6cc8c8ee3..67f871486 100644
--- a/src/share/classes/javax/sql/rowset/serial/package.html
+++ b/src/share/classes/javax/sql/rowset/serial/package.html
@@ -27,9 +27,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 <title>javax.sql.rowset.serial</title>
 </head>
diff --git a/src/share/classes/javax/sql/rowset/spi/package.html b/src/share/classes/javax/sql/rowset/spi/package.html
index dda32560f..89a84a397 100644
--- a/src/share/classes/javax/sql/rowset/spi/package.html
+++ b/src/share/classes/javax/sql/rowset/spi/package.html
@@ -27,9 +27,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
   <title>javax.sql.rowset.spi</title>
    
diff --git a/src/share/classes/javax/swing/border/package.html b/src/share/classes/javax/swing/border/package.html
index 3908080d1..9bd379bd9 100644
--- a/src/share/classes/javax/swing/border/package.html
+++ b/src/share/classes/javax/swing/border/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/colorchooser/package.html b/src/share/classes/javax/swing/colorchooser/package.html
index a67e4ea08..d64ba91b6 100644
--- a/src/share/classes/javax/swing/colorchooser/package.html
+++ b/src/share/classes/javax/swing/colorchooser/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 </head>
 <body bgcolor="white">
diff --git a/src/share/classes/javax/swing/event/package.html b/src/share/classes/javax/swing/event/package.html
index f8be9de71..5a9011356 100644
--- a/src/share/classes/javax/swing/event/package.html
+++ b/src/share/classes/javax/swing/event/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/filechooser/package.html b/src/share/classes/javax/swing/filechooser/package.html
index e01c7f149..58048bab8 100644
--- a/src/share/classes/javax/swing/filechooser/package.html
+++ b/src/share/classes/javax/swing/filechooser/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/package.html b/src/share/classes/javax/swing/package.html
index a6b6d57f1..5666110be 100644
--- a/src/share/classes/javax/swing/package.html
+++ b/src/share/classes/javax/swing/package.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
         <META NAME="Author" Content="Eric Armstrong">
diff --git a/src/share/classes/javax/swing/plaf/basic/package.html b/src/share/classes/javax/swing/plaf/basic/package.html
index ca7d29eaf..f48ba91ad 100644
--- a/src/share/classes/javax/swing/plaf/basic/package.html
+++ b/src/share/classes/javax/swing/plaf/basic/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/plaf/metal/package.html b/src/share/classes/javax/swing/plaf/metal/package.html
index e93410a2d..e60da42ed 100644
--- a/src/share/classes/javax/swing/plaf/metal/package.html
+++ b/src/share/classes/javax/swing/plaf/metal/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/plaf/multi/package.html b/src/share/classes/javax/swing/plaf/multi/package.html
index 1425a02a2..31b212bfb 100644
--- a/src/share/classes/javax/swing/plaf/multi/package.html
+++ b/src/share/classes/javax/swing/plaf/multi/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/plaf/nimbus/package.html b/src/share/classes/javax/swing/plaf/nimbus/package.html
index d4a4f7487..338df175b 100644
--- a/src/share/classes/javax/swing/plaf/nimbus/package.html
+++ b/src/share/classes/javax/swing/plaf/nimbus/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/plaf/package.html b/src/share/classes/javax/swing/plaf/package.html
index 010dd7e9b..fdd354d8c 100644
--- a/src/share/classes/javax/swing/plaf/package.html
+++ b/src/share/classes/javax/swing/plaf/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html b/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
index 5b1b85855..aa0145cfc 100644
--- a/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
+++ b/src/share/classes/javax/swing/plaf/synth/doc-files/componentProperties.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 
 -->
 </head>
diff --git a/src/share/classes/javax/swing/plaf/synth/package.html b/src/share/classes/javax/swing/plaf/synth/package.html
index 7810626db..db63d14f5 100644
--- a/src/share/classes/javax/swing/plaf/synth/package.html
+++ b/src/share/classes/javax/swing/plaf/synth/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 
 
 -->
diff --git a/src/share/classes/javax/swing/table/package.html b/src/share/classes/javax/swing/table/package.html
index ec4104c6a..bb173fbc7 100644
--- a/src/share/classes/javax/swing/table/package.html
+++ b/src/share/classes/javax/swing/table/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/text/html/package.html b/src/share/classes/javax/swing/text/html/package.html
index 8d617c208..74e17f058 100644
--- a/src/share/classes/javax/swing/text/html/package.html
+++ b/src/share/classes/javax/swing/text/html/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/text/html/parser/package.html b/src/share/classes/javax/swing/text/html/parser/package.html
index bbc17dcd1..b21527f98 100644
--- a/src/share/classes/javax/swing/text/html/parser/package.html
+++ b/src/share/classes/javax/swing/text/html/parser/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/text/package.html b/src/share/classes/javax/swing/text/package.html
index b8f1edeb3..8dddf8829 100644
--- a/src/share/classes/javax/swing/text/package.html
+++ b/src/share/classes/javax/swing/text/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/text/rtf/package.html b/src/share/classes/javax/swing/text/rtf/package.html
index 6bc1e46cb..70edc453b 100644
--- a/src/share/classes/javax/swing/text/rtf/package.html
+++ b/src/share/classes/javax/swing/text/rtf/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/tree/package.html b/src/share/classes/javax/swing/tree/package.html
index 76ce8dd52..39a0c8b21 100644
--- a/src/share/classes/javax/swing/tree/package.html
+++ b/src/share/classes/javax/swing/tree/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/swing/undo/package.html b/src/share/classes/javax/swing/undo/package.html
index a73966866..c13c55ff4 100644
--- a/src/share/classes/javax/swing/undo/package.html
+++ b/src/share/classes/javax/swing/undo/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/xml/crypto/dom/package.html b/src/share/classes/javax/xml/crypto/dom/package.html
index 0088132d1..4758373df 100644
--- a/src/share/classes/javax/xml/crypto/dom/package.html
+++ b/src/share/classes/javax/xml/crypto/dom/package.html
@@ -20,9 +20,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/xml/crypto/dsig/dom/package.html b/src/share/classes/javax/xml/crypto/dsig/dom/package.html
index 2f8650a7a..7449617e8 100644
--- a/src/share/classes/javax/xml/crypto/dsig/dom/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/dom/package.html
@@ -20,9 +20,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html b/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
index d89656dac..c97c98fc2 100644
--- a/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/keyinfo/package.html
@@ -20,9 +20,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/xml/crypto/dsig/package.html b/src/share/classes/javax/xml/crypto/dsig/package.html
index c60d8350e..2ba62e50f 100644
--- a/src/share/classes/javax/xml/crypto/dsig/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/package.html
@@ -20,9 +20,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/xml/crypto/dsig/spec/package.html b/src/share/classes/javax/xml/crypto/dsig/spec/package.html
index 1b90e66bc..b52895705 100644
--- a/src/share/classes/javax/xml/crypto/dsig/spec/package.html
+++ b/src/share/classes/javax/xml/crypto/dsig/spec/package.html
@@ -20,9 +20,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/javax/xml/crypto/package.html b/src/share/classes/javax/xml/crypto/package.html
index 91174880c..e5fc99ed9 100644
--- a/src/share/classes/javax/xml/crypto/package.html
+++ b/src/share/classes/javax/xml/crypto/package.html
@@ -20,9 +20,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/org/ietf/jgss/package.html b/src/share/classes/org/ietf/jgss/package.html
index 1027316b3..098b1cce4 100644
--- a/src/share/classes/org/ietf/jgss/package.html
+++ b/src/share/classes/org/ietf/jgss/package.html
@@ -21,9 +21,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
diff --git a/src/share/classes/overview-core.html b/src/share/classes/overview-core.html
index 0d7e1bcb9..86f33fe6c 100644
--- a/src/share/classes/overview-core.html
+++ b/src/share/classes/overview-core.html
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License version
 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.
 -->
 
 </head>
-- 
cgit v1.2.3