diff --git a/jdk/make/common/Subdirs.gmk b/jdk/make/common/Subdirs.gmk index 35515cf8dca..51d0c7f8e97 100644 --- a/jdk/make/common/Subdirs.gmk +++ b/jdk/make/common/Subdirs.gmk @@ -19,7 +19,7 @@ # # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA # or visit www.oracle.com if you need additional information or have any -# have any questions +# questions. # # diff --git a/jdk/src/share/classes/com/sun/jarsigner/package.html b/jdk/src/share/classes/com/sun/jarsigner/package.html index 80a84aa5a24..b00d655d9a2 100644 --- a/jdk/src/share/classes/com/sun/jarsigner/package.html +++ b/jdk/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. --> Jarsigner Signing Mechanism Package diff --git a/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html b/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html index bdc521d15e2..084e0df7e10 100644 --- a/jdk/src/share/classes/com/sun/java/util/jar/pack/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jdi/connect/package.html b/jdk/src/share/classes/com/sun/jdi/connect/package.html index c623891bb5f..7484ce2ca6e 100644 --- a/jdk/src/share/classes/com/sun/jdi/connect/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html b/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html index b21d2fe6bcb..29f98ede107 100644 --- a/jdk/src/share/classes/com/sun/jdi/connect/spi/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jdi/event/package.html b/jdk/src/share/classes/com/sun/jdi/event/package.html index 922aeb45aa5..521a8b7c85f 100644 --- a/jdk/src/share/classes/com/sun/jdi/event/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jdi/package.html b/jdk/src/share/classes/com/sun/jdi/package.html index 3c8f89e55b3..5aee603d981 100644 --- a/jdk/src/share/classes/com/sun/jdi/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jdi/request/package.html b/jdk/src/share/classes/com/sun/jdi/request/package.html index b56bd71ea5e..c99c1c8e359 100644 --- a/jdk/src/share/classes/com/sun/jdi/request/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/defaults/package.html b/jdk/src/share/classes/com/sun/jmx/defaults/package.html index 66600e3d4f4..273fafd9dc0 100644 --- a/jdk/src/share/classes/com/sun/jmx/defaults/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/interceptor/package.html b/jdk/src/share/classes/com/sun/jmx/interceptor/package.html index 0e79aaca6e4..f6890825550 100644 --- a/jdk/src/share/classes/com/sun/jmx/interceptor/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html b/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html index fc15bd1dff0..d2068992d01 100644 --- a/jdk/src/share/classes/com/sun/jmx/mbeanserver/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html b/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html index 2b0f6915fc8..134840fd550 100644 --- a/jdk/src/share/classes/com/sun/jmx/remote/internal/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html index 9d9586086be..c3a9a1d14e1 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/IPAcl/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html index 53196012a79..0eca90054b5 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/agent/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html index 9cc9b0aa5bb..353587f759d 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/daemon/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html index 3b1093d9486..2305ad19938 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/defaults/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html index fa1b4c5e1da..ae5a2687171 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/internal/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html index e1e86ec5152..a8eb1e4ca55 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/mpm/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/package.html index bf51fea24f0..cdef83dfae2 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html b/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html index cc34d81aefb..3e10a9d8f46 100644 --- a/jdk/src/share/classes/com/sun/jmx/snmp/tasks/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/management/mgmt-overview.html b/jdk/src/share/classes/com/sun/management/mgmt-overview.html index 4e3b6980148..7af4e92b7c4 100644 --- a/jdk/src/share/classes/com/sun/management/mgmt-overview.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/management/package.html b/jdk/src/share/classes/com/sun/management/package.html index 48a0575b1bc..b4c66900c22 100644 --- a/jdk/src/share/classes/com/sun/management/package.html +++ b/jdk/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. --> diff --git a/jdk/src/share/classes/com/sun/net/ssl/package.html b/jdk/src/share/classes/com/sun/net/ssl/package.html index e00ca50759e..20352c2b117 100644 --- a/jdk/src/share/classes/com/sun/net/ssl/package.html +++ b/jdk/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/jdk/src/share/classes/com/sun/rowset/providers/package.html b/jdk/src/share/classes/com/sun/rowset/providers/package.html index 572d48c60f9..f75681fa7de 100644 --- a/jdk/src/share/classes/com/sun/rowset/providers/package.html +++ b/jdk/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. --> javax.sql.rowset.providers Package diff --git a/jdk/src/share/classes/com/sun/servicetag/package.html b/jdk/src/share/classes/com/sun/servicetag/package.html index 59d2e0fd78a..8c7c90a1162 100644 --- a/jdk/src/share/classes/com/sun/servicetag/package.html +++ b/jdk/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/jdk/src/share/classes/com/sun/servicetag/resources/register.html b/jdk/src/share/classes/com/sun/servicetag/resources/register.html index 263d73e8e7e..7684268eb6e 100644 --- a/jdk/src/share/classes/com/sun/servicetag/resources/register.html +++ b/jdk/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. -->