changeset 2552:8356c7fa1a33

. Merge Linux/Solaris specific changes into the BSD specific files.
author Greg Lewis <glewis@eyesbeyond.com>
date Sun, 04 Jul 2010 22:16:37 -0700
parents e0d42f7460b5
children 3f4f265e52c0
files make/com/sun/tools/attach/mapfile-bsd make/common/Defs-bsd.gmk make/common/shared/Defs-bsd.gmk make/java/nio/mapfile-bsd make/netbeans/common/architectures/name-Bsd.properties make/sun/awt/mapfile-vers-bsd make/tools/sharing/classlist.bsd src/bsd/doc/man/appletviewer.1 src/bsd/doc/man/apt.1 src/bsd/doc/man/extcheck.1 src/bsd/doc/man/idlj.1 src/bsd/doc/man/ja/appletviewer.1 src/bsd/doc/man/ja/apt.1 src/bsd/doc/man/ja/extcheck.1 src/bsd/doc/man/ja/idlj.1 src/bsd/doc/man/ja/jar.1 src/bsd/doc/man/ja/jarsigner.1 src/bsd/doc/man/ja/java.1 src/bsd/doc/man/ja/javac.1 src/bsd/doc/man/ja/javadoc.1 src/bsd/doc/man/ja/javah.1 src/bsd/doc/man/ja/javap.1 src/bsd/doc/man/ja/javaws.1 src/bsd/doc/man/ja/jconsole.1 src/bsd/doc/man/ja/jdb.1 src/bsd/doc/man/ja/jhat.1 src/bsd/doc/man/ja/jinfo.1 src/bsd/doc/man/ja/jmap.1 src/bsd/doc/man/ja/jps.1 src/bsd/doc/man/ja/jrunscript.1 src/bsd/doc/man/ja/jsadebugd.1 src/bsd/doc/man/ja/jstack.1 src/bsd/doc/man/ja/jstat.1 src/bsd/doc/man/ja/jstatd.1 src/bsd/doc/man/ja/keytool.1 src/bsd/doc/man/ja/kinit.1 src/bsd/doc/man/ja/klist.1 src/bsd/doc/man/ja/ktab.1 src/bsd/doc/man/ja/native2ascii.1 src/bsd/doc/man/ja/orbd.1 src/bsd/doc/man/ja/pack200.1 src/bsd/doc/man/ja/policytool.1 src/bsd/doc/man/ja/rmic.1 src/bsd/doc/man/ja/rmid.1 src/bsd/doc/man/ja/rmiregistry.1 src/bsd/doc/man/ja/schemagen.1 src/bsd/doc/man/ja/serialver.1 src/bsd/doc/man/ja/servertool.1 src/bsd/doc/man/ja/tnameserv.1 src/bsd/doc/man/ja/unpack200.1 src/bsd/doc/man/ja/wsgen.1 src/bsd/doc/man/ja/wsimport.1 src/bsd/doc/man/ja/xjc.1 src/bsd/doc/man/jar.1 src/bsd/doc/man/jarsigner.1 src/bsd/doc/man/java.1 src/bsd/doc/man/javac.1 src/bsd/doc/man/javadoc.1 src/bsd/doc/man/javah.1 src/bsd/doc/man/javap.1 src/bsd/doc/man/javaws.1 src/bsd/doc/man/jconsole.1 src/bsd/doc/man/jdb.1 src/bsd/doc/man/jhat.1 src/bsd/doc/man/jinfo.1 src/bsd/doc/man/jmap.1 src/bsd/doc/man/jps.1 src/bsd/doc/man/jrunscript.1 src/bsd/doc/man/jsadebugd.1 src/bsd/doc/man/jstack.1 src/bsd/doc/man/jstat.1 src/bsd/doc/man/jstatd.1 src/bsd/doc/man/keytool.1 src/bsd/doc/man/native2ascii.1 src/bsd/doc/man/orbd.1 src/bsd/doc/man/pack200.1 src/bsd/doc/man/policytool.1 src/bsd/doc/man/rmic.1 src/bsd/doc/man/rmid.1 src/bsd/doc/man/rmiregistry.1 src/bsd/doc/man/schemagen.1 src/bsd/doc/man/serialver.1 src/bsd/doc/man/servertool.1 src/bsd/doc/man/tnameserv.1 src/bsd/doc/man/unpack200.1 src/bsd/doc/man/wsgen.1 src/bsd/doc/man/wsimport.1 src/bsd/doc/man/xjc.1 src/solaris/classes/java/lang/UNIXProcess.java.bsd src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties src/solaris/classes/sun/nio/fs/BsdFileStore.java src/solaris/classes/sun/nio/fs/BsdFileSystem.java src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java src/solaris/classes/sun/tools/attach/BsdAttachProvider.java src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java src/solaris/hpi/include/largefile_bsd.h src/solaris/hpi/native_threads/src/threads_bsd.c src/solaris/native/java/net/bsd_close.c src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c src/solaris/native/sun/tools/attach/BsdVirtualMachine.c test/sun/security/tools/jarsigner/diffend.sh
diffstat 102 files changed, 365 insertions(+), 356 deletions(-) [+]
line wrap: on
line diff
--- a/make/com/sun/tools/attach/mapfile-bsd	Tue Jun 15 22:26:49 2010 -0700
+++ b/make/com/sun/tools/attach/mapfile-bsd	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 #
-# Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
 #
 
 # Define public interface.
--- a/make/common/Defs-bsd.gmk	Tue Jun 15 22:26:49 2010 -0700
+++ b/make/common/Defs-bsd.gmk	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 #
-# Copyright 1999-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
 #
 
 #
@@ -200,7 +200,15 @@
   CXXFLAGS_DBG	+= $(CC_OPT/$(FASTDEBUG_OPTIMIZATION_LEVEL))
 endif
 
-CPPFLAGS_COMMON = -D$(ARCH) -DARCH='"$(ARCH)"' -D_ALLBSD_SOURCE $(VERSION_DEFINES) \
+CPP_ARCH_FLAGS = -DARCH='"$(ARCH)"'
+
+# Alpha arch does not like "alpha" defined (potential general arch cleanup issue here)
+ifneq ($(ARCH),alpha)
+  CPP_ARCH_FLAGS += -D$(ARCH)
+else
+  CPP_ARCH_FLAGS += -D_$(ARCH)_
+endif
+CPPFLAGS_COMMON = $(CPP_ARCH_FLAGS) -D_ALLBSD_SOURCE $(VERSION_DEFINES) \
 		  -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
 
 ifeq ($(ARCH_DATA_MODEL), 64)
--- a/make/common/shared/Defs-bsd.gmk	Tue Jun 15 22:26:49 2010 -0700
+++ b/make/common/shared/Defs-bsd.gmk	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 #
-# Copyright 2005-2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
 #
 
 #
--- a/make/java/nio/mapfile-bsd	Tue Jun 15 22:26:49 2010 -0700
+++ b/make/java/nio/mapfile-bsd	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 #
-# Copyright 2001-2009 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2001, 2009, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
 #
 
 SUNWprivate_1.1 {
--- a/make/netbeans/common/architectures/name-Bsd.properties	Tue Jun 15 22:26:49 2010 -0700
+++ b/make/netbeans/common/architectures/name-Bsd.properties	Sun Jul 04 22:16:37 2010 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -12,7 +12,7 @@
 #     notice, this list of conditions and the following disclaimer in the
 #     documentation and/or other materials provided with the distribution.
 #
-#   - Neither the name of Sun Microsystems nor the names of its
+#   - Neither the name of Oracle nor the names of its
 #     contributors may be used to endorse or promote products derived
 #     from this software without specific prior written permission.
 #
--- a/make/sun/awt/mapfile-vers-bsd	Tue Jun 15 22:26:49 2010 -0700
+++ b/make/sun/awt/mapfile-vers-bsd	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 #
-# Copyright 2002-2008 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2002, 2008, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
 #
 
 # Define public interface for libawt.so on Bsd.
@@ -425,6 +425,7 @@
 		Java_sun_awt_X11GraphicsEnvironment_initDisplay;
 		Java_sun_awt_X11GraphicsEnvironment_pRunningXinerama;
 		Java_sun_awt_X11GraphicsEnvironment_getXineramaCenterPoint;
+		Java_sun_awt_X11GraphicsEnvironment_initXRender;
         
         
 
--- a/make/tools/sharing/classlist.bsd	Tue Jun 15 22:26:49 2010 -0700
+++ b/make/tools/sharing/classlist.bsd	Sun Jul 04 22:16:37 2010 -0700
@@ -2259,7 +2259,6 @@
 com/sun/java/swing/plaf/gtk/GTKLookAndFeel$2
 com/sun/java/swing/plaf/gtk/GTKLookAndFeel$3
 javax/swing/plaf/synth/SynthPanelUI
-sun/swing/plaf/synth/SynthUI
 javax/swing/plaf/synth/SynthConstants
 javax/swing/plaf/synth/SynthContext
 javax/swing/plaf/synth/SynthBorder
@@ -2271,6 +2270,7 @@
 javax/swing/plaf/synth/SynthMenuBarUI
 javax/swing/plaf/synth/DefaultMenuLayout
 javax/swing/plaf/synth/SynthMenuUI
+javax/swing/plaf/synth/SynthUI
 com/sun/java/swing/plaf/gtk/GTKIconFactory
 com/sun/java/swing/plaf/gtk/GTKIconFactory$MenuArrowIcon
 com/sun/java/swing/plaf/gtk/GTKIconFactory$DelegatingIcon
--- a/src/bsd/doc/man/appletviewer.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/appletviewer.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH appletviewer 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/apt.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/apt.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH apt 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/extcheck.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/extcheck.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH extcheck 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/idlj.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/idlj.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH idlj 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/appletviewer.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/appletviewer.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH appletviewer 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/apt.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/apt.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH apt 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/extcheck.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/extcheck.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH extcheck 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/idlj.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/idlj.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH idlj 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jar.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jar.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jar 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jarsigner.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jarsigner.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jarsigner 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/java.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/java.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH java 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/javac.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/javac.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javac 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/javadoc.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/javadoc.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javadoc 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/javah.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/javah.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javah 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/javap.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/javap.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javap 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/javaws.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/javaws.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javaws 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jconsole.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jconsole.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jconsole 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jdb.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jdb.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jdb 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jhat.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jhat.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jhat 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jinfo.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jinfo.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jinfo 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jmap.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jmap.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jmap 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jps.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jps.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jps 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jrunscript.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jrunscript.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jrunscript 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jsadebugd.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jsadebugd.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jsadebugd 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jstack.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jstack.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jstack 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jstat.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jstat.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jstat 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/jstatd.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/jstatd.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jstatd 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/keytool.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/keytool.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH keytool 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/kinit.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/kinit.1	Sun Jul 04 22:16:37 2010 -0700
@@ -17,9 +17,9 @@
 .\" 2 along with this work; if not, write to the Free Software Foundation,
 .\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 .\"
-.\" Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-.\" CA 95054 USA or visit www.sun.com if you need additional information or
-.\" have any questions.
+.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+.\" or visit www.oracle.com if you need additional information or have any
+.\" questions.
 .\"
 .\"
 .\" 
--- a/src/bsd/doc/man/ja/klist.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/klist.1	Sun Jul 04 22:16:37 2010 -0700
@@ -17,9 +17,9 @@
 .\" 2 along with this work; if not, write to the Free Software Foundation,
 .\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 .\"
-.\" Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-.\" CA 95054 USA or visit www.sun.com if you need additional information or
-.\" have any questions.
+.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+.\" or visit www.oracle.com if you need additional information or have any
+.\" questions.
 .\"
 .\" 
 .TH klist 1 "2004 年 6 月 22 日"
--- a/src/bsd/doc/man/ja/ktab.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/ktab.1	Sun Jul 04 22:16:37 2010 -0700
@@ -17,9 +17,9 @@
 .\" 2 along with this work; if not, write to the Free Software Foundation,
 .\" Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 .\"
-.\" Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-.\" CA 95054 USA or visit www.sun.com if you need additional information or
-.\" have any questions.
+.\" Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+.\" or visit www.oracle.com if you need additional information or have any
+.\" questions.
 .\"
 .\" 
 .TH ktab 1 "2004 年 6 月 22 日"
--- a/src/bsd/doc/man/ja/native2ascii.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/native2ascii.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH native2ascii 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/orbd.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/orbd.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH orbd 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/pack200.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/pack200.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH pack200 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/policytool.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/policytool.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH policytool 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/rmic.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/rmic.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH rmic 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/rmid.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/rmid.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH rmid 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/rmiregistry.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/rmiregistry.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH rmiregistry 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/schemagen.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/schemagen.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH schemagen 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/serialver.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/serialver.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH serialver 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/servertool.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/servertool.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH servertool 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/tnameserv.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/tnameserv.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH tnameserv 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/unpack200.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/unpack200.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH unpack200 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/wsgen.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/wsgen.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH wsgen 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/wsimport.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/wsimport.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH wsimport 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/ja/xjc.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/ja/xjc.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH xjc 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jar.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jar.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jar 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jarsigner.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jarsigner.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jarsigner 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/java.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/java.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH java 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/javac.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/javac.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javac 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/javadoc.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/javadoc.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javadoc 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/javah.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/javah.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javah 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/javap.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/javap.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javap 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/javaws.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/javaws.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH javaws 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jconsole.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jconsole.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jconsole 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jdb.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jdb.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jdb 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jhat.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jhat.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jhat 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jinfo.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jinfo.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jinfo 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jmap.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jmap.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jmap 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jps.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jps.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jps 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jrunscript.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jrunscript.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jrunscript 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jsadebugd.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jsadebugd.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jsadebugd 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jstack.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jstack.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jstack 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jstat.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jstat.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jstat 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/jstatd.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/jstatd.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH jstatd 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/keytool.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/keytool.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH keytool 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/native2ascii.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/native2ascii.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH native2ascii 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/orbd.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/orbd.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH orbd 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/pack200.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/pack200.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH pack200 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/policytool.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/policytool.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH policytool 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/rmic.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/rmic.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH rmic 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/rmid.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/rmid.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH rmid 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/rmiregistry.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/rmiregistry.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH rmiregistry 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/schemagen.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/schemagen.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH schemagen 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/serialver.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/serialver.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH serialver 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/servertool.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/servertool.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH servertool 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/tnameserv.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/tnameserv.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH tnameserv 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/unpack200.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/unpack200.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH unpack200 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/wsgen.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/wsgen.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH wsgen 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/wsimport.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/wsimport.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH wsimport 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/bsd/doc/man/xjc.1	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/bsd/doc/man/xjc.1	Sun Jul 04 22:16:37 2010 -0700
@@ -15,9 +15,9 @@
 ." 2 along with this work; if not, write to the Free Software Foundation,
 ." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 ."
-." Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-." CA 95054 USA or visit www.sun.com if you need additional information or
-." have any questions.
+." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+." or visit www.oracle.com if you need additional information or have any
+." questions.
 ."
 .TH xjc 1 "04 May 2009"
 ." Generated from HTML by html2man (author: Eric Armstrong)
--- a/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/java/lang/UNIXProcess.java.bsd	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 1995-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 package java.lang;
--- a/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.properties	Sun Jul 04 22:16:37 2010 -0700
@@ -1,13 +1,13 @@
 #
 # 
-# Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
+# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Sun designates this
+# published by the Free Software Foundation.  Oracle designates this
 # particular file as subject to the "Classpath" exception as provided
-# by Sun in the LICENSE file that accompanied this code.
+# by Oracle in the LICENSE file that accompanied this code.
 #
 # This code is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -19,9 +19,9 @@
 # 2 along with this work; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
 #
-# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-# CA 95054 USA or visit www.sun.com if you need additional information or
-# have any questions.
+# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+# or visit www.oracle.com if you need additional information or have any
+# questions.
 #
 
 # Version
--- a/src/solaris/classes/sun/nio/fs/BsdFileStore.java	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/sun/nio/fs/BsdFileStore.java	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 package sun.nio.fs;
--- a/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/sun/nio/fs/BsdFileSystem.java	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 package sun.nio.fs;
--- a/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2008-2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 package sun.nio.fs;
--- a/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 package sun.nio.fs;
--- a/src/solaris/classes/sun/tools/attach/BsdAttachProvider.java	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/sun/tools/attach/BsdAttachProvider.java	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 package sun.tools.attach;
 
--- a/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2005, 2006, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 package sun.tools.attach;
 
--- a/src/solaris/hpi/include/largefile_bsd.h	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/hpi/include/largefile_bsd.h	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 1999 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 1999, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 #ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
--- a/src/solaris/hpi/native_threads/src/threads_bsd.c	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/hpi/native_threads/src/threads_bsd.c	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 1998-2004 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 #ifdef __APPLE__
--- a/src/solaris/native/java/net/bsd_close.c	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/native/java/net/bsd_close.c	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2001-2008 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2001, 2008, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 #include <stdio.h>
--- a/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 #include "jni.h"
--- a/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Tue Jun 15 22:26:49 2010 -0700
+++ b/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c	Sun Jul 04 22:16:37 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2005 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Sun designates this
+ * published by the Free Software Foundation.  Oracle designates this
  * particular file as subject to the "Classpath" exception as provided
- * by Sun in the LICENSE file that accompanied this code.
+ * by Oracle in the LICENSE file that accompanied this code.
  *
  * This code is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -18,9 +18,9 @@
  * 2 along with this work; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
  *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
  */
 
 #include "jni.h"
--- a/test/sun/security/tools/jarsigner/diffend.sh	Tue Jun 15 22:26:49 2010 -0700
+++ b/test/sun/security/tools/jarsigner/diffend.sh	Sun Jul 04 22:16:37 2010 -0700
@@ -41,7 +41,7 @@
 # set platform-dependent variables
 OS=`uname -s`
 case "$OS" in
-  SunOS | Linux )
+  SunOS | Linux | *BSD | Darwin)
     NULL=/dev/null
     PS=":"
     FS="/"