changeset 580:f2fdd52e4e87

6944312: Potential rebranding issues in openjdk/langtools repository sources Reviewed-by: darcy
author jjg
date Thu, 10 Jun 2010 16:08:01 -0700
parents 46cf751559ae
children 366a7b9b5627
files src/share/classes/com/sun/javadoc/package.html src/share/classes/com/sun/mirror/overview.html src/share/classes/com/sun/source/tree/DisjointTypeTree.java src/share/classes/com/sun/tools/apt/comp/Apt.java src/share/classes/com/sun/tools/apt/main/CommandLine.java src/share/classes/com/sun/tools/apt/main/JavaCompiler.java src/share/classes/com/sun/tools/apt/main/Main.java src/share/classes/com/sun/tools/apt/util/Bark.java src/share/classes/com/sun/tools/classfile/AccessFlags.java src/share/classes/com/sun/tools/classfile/Annotation.java src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java src/share/classes/com/sun/tools/classfile/Attribute.java src/share/classes/com/sun/tools/classfile/AttributeException.java src/share/classes/com/sun/tools/classfile/Attributes.java src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java src/share/classes/com/sun/tools/classfile/ClassFile.java src/share/classes/com/sun/tools/classfile/ClassReader.java src/share/classes/com/sun/tools/classfile/ClassTranslator.java src/share/classes/com/sun/tools/classfile/ClassWriter.java src/share/classes/com/sun/tools/classfile/Code_attribute.java src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java src/share/classes/com/sun/tools/classfile/ConstantPool.java src/share/classes/com/sun/tools/classfile/ConstantPoolException.java src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java src/share/classes/com/sun/tools/classfile/DefaultAttribute.java src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java src/share/classes/com/sun/tools/classfile/Descriptor.java src/share/classes/com/sun/tools/classfile/DescriptorException.java src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java src/share/classes/com/sun/tools/classfile/Field.java src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java src/share/classes/com/sun/tools/classfile/Instruction.java src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java src/share/classes/com/sun/tools/classfile/Method.java src/share/classes/com/sun/tools/classfile/Opcode.java src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java src/share/classes/com/sun/tools/classfile/Signature.java src/share/classes/com/sun/tools/classfile/Signature_attribute.java src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java src/share/classes/com/sun/tools/classfile/SourceID_attribute.java src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java src/share/classes/com/sun/tools/classfile/StackMap_attribute.java src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java src/share/classes/com/sun/tools/classfile/Type.java src/share/classes/com/sun/tools/javac/Launcher.java src/share/classes/com/sun/tools/javac/Server.java src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java src/share/classes/com/sun/tools/javac/api/Formattable.java src/share/classes/com/sun/tools/javac/api/JavacScope.java src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java src/share/classes/com/sun/tools/javac/api/JavacTool.java src/share/classes/com/sun/tools/javac/api/JavacTrees.java src/share/classes/com/sun/tools/javac/api/Messages.java src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java src/share/classes/com/sun/tools/javac/code/Attribute.java src/share/classes/com/sun/tools/javac/code/BoundKind.java src/share/classes/com/sun/tools/javac/code/Flags.java src/share/classes/com/sun/tools/javac/code/Kinds.java src/share/classes/com/sun/tools/javac/code/Lint.java src/share/classes/com/sun/tools/javac/code/Printer.java src/share/classes/com/sun/tools/javac/code/Scope.java src/share/classes/com/sun/tools/javac/code/Source.java src/share/classes/com/sun/tools/javac/code/Symbol.java src/share/classes/com/sun/tools/javac/code/Symtab.java src/share/classes/com/sun/tools/javac/code/TargetType.java src/share/classes/com/sun/tools/javac/code/Type.java src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java src/share/classes/com/sun/tools/javac/code/TypeTags.java src/share/classes/com/sun/tools/javac/code/Types.java src/share/classes/com/sun/tools/javac/comp/Annotate.java src/share/classes/com/sun/tools/javac/comp/Attr.java src/share/classes/com/sun/tools/javac/comp/AttrContext.java src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java src/share/classes/com/sun/tools/javac/comp/Check.java src/share/classes/com/sun/tools/javac/comp/ConstFold.java src/share/classes/com/sun/tools/javac/comp/Enter.java src/share/classes/com/sun/tools/javac/comp/Env.java src/share/classes/com/sun/tools/javac/comp/Flow.java src/share/classes/com/sun/tools/javac/comp/Infer.java src/share/classes/com/sun/tools/javac/comp/Lower.java src/share/classes/com/sun/tools/javac/comp/MemberEnter.java src/share/classes/com/sun/tools/javac/comp/Resolve.java src/share/classes/com/sun/tools/javac/comp/Todo.java src/share/classes/com/sun/tools/javac/comp/TransTypes.java src/share/classes/com/sun/tools/javac/file/BaseFileObject.java src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java src/share/classes/com/sun/tools/javac/file/FSInfo.java src/share/classes/com/sun/tools/javac/file/JavacFileManager.java src/share/classes/com/sun/tools/javac/file/Paths.java src/share/classes/com/sun/tools/javac/file/RegularFileObject.java src/share/classes/com/sun/tools/javac/file/RelativePath.java src/share/classes/com/sun/tools/javac/file/SymbolArchive.java src/share/classes/com/sun/tools/javac/file/ZipArchive.java src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java src/share/classes/com/sun/tools/javac/jvm/CRTable.java src/share/classes/com/sun/tools/javac/jvm/ClassFile.java src/share/classes/com/sun/tools/javac/jvm/ClassReader.java src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java src/share/classes/com/sun/tools/javac/jvm/Code.java src/share/classes/com/sun/tools/javac/jvm/Gen.java src/share/classes/com/sun/tools/javac/jvm/Items.java src/share/classes/com/sun/tools/javac/jvm/Pool.java src/share/classes/com/sun/tools/javac/jvm/Target.java src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java src/share/classes/com/sun/tools/javac/main/CommandLine.java src/share/classes/com/sun/tools/javac/main/JavaCompiler.java src/share/classes/com/sun/tools/javac/main/JavacOption.java src/share/classes/com/sun/tools/javac/main/Main.java src/share/classes/com/sun/tools/javac/main/OptionName.java src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java src/share/classes/com/sun/tools/javac/model/JavacElements.java src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java src/share/classes/com/sun/tools/javac/model/JavacTypes.java src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java src/share/classes/com/sun/tools/javac/nio/PathFileManager.java src/share/classes/com/sun/tools/javac/nio/PathFileObject.java src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java src/share/classes/com/sun/tools/javac/parser/EndPosParser.java src/share/classes/com/sun/tools/javac/parser/JavacParser.java src/share/classes/com/sun/tools/javac/parser/Keywords.java src/share/classes/com/sun/tools/javac/parser/Lexer.java src/share/classes/com/sun/tools/javac/parser/Parser.java src/share/classes/com/sun/tools/javac/parser/ParserFactory.java src/share/classes/com/sun/tools/javac/parser/Scanner.java src/share/classes/com/sun/tools/javac/parser/Token.java src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java src/share/classes/com/sun/tools/javac/processing/JavacFiler.java src/share/classes/com/sun/tools/javac/processing/JavacMessager.java src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java src/share/classes/com/sun/tools/javac/tree/JCTree.java src/share/classes/com/sun/tools/javac/tree/Pretty.java src/share/classes/com/sun/tools/javac/tree/TreeCopier.java src/share/classes/com/sun/tools/javac/tree/TreeInfo.java src/share/classes/com/sun/tools/javac/tree/TreeMaker.java src/share/classes/com/sun/tools/javac/tree/TreeScanner.java src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java src/share/classes/com/sun/tools/javac/util/Abort.java src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java src/share/classes/com/sun/tools/javac/util/AbstractLog.java src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java src/share/classes/com/sun/tools/javac/util/Bits.java src/share/classes/com/sun/tools/javac/util/ByteBuffer.java src/share/classes/com/sun/tools/javac/util/ClientCodeException.java src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java src/share/classes/com/sun/tools/javac/util/Constants.java src/share/classes/com/sun/tools/javac/util/Context.java src/share/classes/com/sun/tools/javac/util/Convert.java src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java src/share/classes/com/sun/tools/javac/util/FatalError.java src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java src/share/classes/com/sun/tools/javac/util/JavacMessages.java src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java src/share/classes/com/sun/tools/javac/util/List.java src/share/classes/com/sun/tools/javac/util/ListBuffer.java src/share/classes/com/sun/tools/javac/util/Log.java src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java src/share/classes/com/sun/tools/javac/util/Name.java src/share/classes/com/sun/tools/javac/util/Names.java src/share/classes/com/sun/tools/javac/util/Options.java src/share/classes/com/sun/tools/javac/util/Pair.java src/share/classes/com/sun/tools/javac/util/Position.java src/share/classes/com/sun/tools/javac/util/PropagatedException.java src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java src/share/classes/com/sun/tools/javac/util/SharedNameTable.java src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java src/share/classes/com/sun/tools/javac/util/Warner.java src/share/classes/com/sun/tools/javah/Gen.java src/share/classes/com/sun/tools/javah/InternalError.java src/share/classes/com/sun/tools/javah/JNI.java src/share/classes/com/sun/tools/javah/JavahFileManager.java src/share/classes/com/sun/tools/javah/JavahTask.java src/share/classes/com/sun/tools/javah/JavahTool.java src/share/classes/com/sun/tools/javah/LLNI.java src/share/classes/com/sun/tools/javah/Main.java src/share/classes/com/sun/tools/javah/Mangle.java src/share/classes/com/sun/tools/javah/NativeHeaderTool.java src/share/classes/com/sun/tools/javah/TypeSignature.java src/share/classes/com/sun/tools/javah/Util.java src/share/classes/com/sun/tools/javap/AnnotationWriter.java src/share/classes/com/sun/tools/javap/AttributeWriter.java src/share/classes/com/sun/tools/javap/BasicWriter.java src/share/classes/com/sun/tools/javap/ClassWriter.java src/share/classes/com/sun/tools/javap/CodeWriter.java src/share/classes/com/sun/tools/javap/ConstantWriter.java src/share/classes/com/sun/tools/javap/Context.java src/share/classes/com/sun/tools/javap/DisassemblerTool.java src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java src/share/classes/com/sun/tools/javap/InternalError.java src/share/classes/com/sun/tools/javap/JavapFileManager.java src/share/classes/com/sun/tools/javap/JavapTask.java src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java src/share/classes/com/sun/tools/javap/Main.java src/share/classes/com/sun/tools/javap/Messages.java src/share/classes/com/sun/tools/javap/Options.java src/share/classes/com/sun/tools/javap/SourceWriter.java src/share/classes/com/sun/tools/javap/StackMapWriter.java src/share/classes/com/sun/tools/javap/TryBlockWriter.java src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java src/share/classes/javax/lang/model/overview.html test/tools/apt/mirror/declaration/pkg1/pkg2/package.html test/tools/javac/6948381/T6948381.java test/tools/javac/6948381/npe/A.java test/tools/javac/6948381/npe/B.java test/tools/javac/api/evalexpr/ByteArrayClassLoader.java test/tools/javac/api/evalexpr/CompileFromString.java test/tools/javac/api/evalexpr/MemoryFileManager.java test/tools/javac/generics/diamond/T6951833.java test/tools/javac/generics/typevars/T6880344.java test/tools/javac/varargs/warning/Warn4.java
diffstat 234 files changed, 429 insertions(+), 430 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/com/sun/javadoc/package.html	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/javadoc/package.html	Thu Jun 10 16:08:01 2010 -0700
@@ -22,9 +22,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.
 -->
 </head>
 <body bgcolor="white">
--- a/src/share/classes/com/sun/mirror/overview.html	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/mirror/overview.html	Thu Jun 10 16:08:01 2010 -0700
@@ -22,9 +22,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.
 -->
 </head>
 
--- a/src/share/classes/com/sun/source/tree/DisjointTypeTree.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/source/tree/DisjointTypeTree.java	Thu Jun 10 16:08:01 2010 -0700
@@ -1,12 +1,12 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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 com.sun.source.tree;
@@ -37,4 +37,4 @@
  */
 public interface DisjointTypeTree extends Tree {
     List<? extends Tree> getTypeComponents();
-}
\ No newline at end of file
+}
--- a/src/share/classes/com/sun/tools/apt/comp/Apt.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/apt/comp/Apt.java	Thu Jun 10 16:08:01 2010 -0700
@@ -60,7 +60,7 @@
 /**
  * Apt compiler phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.
+ *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/apt/main/CommandLine.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/apt/main/CommandLine.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,8 +35,8 @@
 /**
  * Various utility methods for processing Java tool command line arguments.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java	Thu Jun 10 16:08:01 2010 -0700
@@ -45,7 +45,7 @@
 import com.sun.tools.javac.parser.DocCommentScanner;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.
+ *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/apt/main/Main.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/apt/main/Main.java	Thu Jun 10 16:08:01 2010 -0700
@@ -61,7 +61,7 @@
 /** This class provides a commandline interface to the apt build-time
  *  tool.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.
+ *  <p><b>This is NOT part of any supported API.
  *  If you write code that depends on this, you do so at your own
  *  risk.  This code and its internal interfaces are subject to change
  *  or deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/apt/util/Bark.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/apt/util/Bark.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,8 +34,8 @@
 
 /** A subtype of Log for use in APT.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/AccessFlags.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 /**
  * See JVMS3, sections 4.2, 4.6, 4.7.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Annotation.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Annotation.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.16.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/AnnotationDefault_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.15.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 import java.util.Map;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/AttributeException.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/AttributeException.java	Thu Jun 10 16:08:01 2010 -0700
@@ -26,8 +26,8 @@
 package com.sun.tools.classfile;
 
 /*
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Attributes.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Attributes.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 import java.util.Map;
 
 /*
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/CharacterRangeTable_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 import java.io.IOException;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ClassFile.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ClassFile.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,8 +35,8 @@
 /**
  * See JVMS3, section 4.2.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ClassReader.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ClassReader.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 import java.io.InputStream;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ClassTranslator.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ClassTranslator.java	Thu Jun 10 16:08:01 2010 -0700
@@ -42,8 +42,8 @@
 /**
  * Rewrites a class file using a map of translations.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ClassWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -41,8 +41,8 @@
 /**
  * Write a ClassFile data structure to a file or stream.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Code_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 /**
  * See JVMS3, section 4.8.3.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/CompilationID_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -27,8 +27,8 @@
 import java.io.IOException;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ConstantPool.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ConstantPool.java	Thu Jun 10 16:08:01 2010 -0700
@@ -33,8 +33,8 @@
 /**
  * See JVMS3, section 4.5.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ConstantPoolException.java	Thu Jun 10 16:08:01 2010 -0700
@@ -27,8 +27,8 @@
 package com.sun.tools.classfile;
 
 /*
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ConstantValue_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.2.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/DefaultAttribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -26,8 +26,8 @@
 package com.sun.tools.classfile;
 
 /*
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Deprecated_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.15.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Descriptor.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Descriptor.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 /**
  * See JVMS3, section 4.4.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/DescriptorException.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/DescriptorException.java	Thu Jun 10 16:08:01 2010 -0700
@@ -27,8 +27,8 @@
 package com.sun.tools.classfile;
 
 /*
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/EnclosingMethod_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 /**
  * See JVMS3, section 4.8.7.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Exceptions_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.5.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
 /**
  * See JSR 308 specification, section 4.1
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Field.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Field.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 import java.io.IOException;
 
 /*
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/InnerClasses_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 /**
  * See JVMS3, section 4.8.6.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Instruction.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Instruction.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 /**
  * See JVMS3, chapter 6.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  *
--- a/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/LineNumberTable_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.12.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTable_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.13.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/LocalVariableTypeTable_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.14.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Method.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Method.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 import java.io.IOException;
 
 /*
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Opcode.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Opcode.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,8 +34,8 @@
  * <p>In addition to providing all the standard opcodes defined in JVMS,
  * this class also provides legacy support for the PicoJava extensions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.16 and 4.8.17.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.17.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.18.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JSR 308 specification, section 4.1
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeParameterAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.18 and 4.8.19.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JSR 308 specification, section 4
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.16.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.18.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JSR 308 specification, section 4.1
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Signature.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Signature.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 /**
  * See JVMS3 4.4.4.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Signature_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Signature_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.9.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/SourceDebugExtension_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 /**
  * See JVMS3, section 4.8.15.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/SourceFile_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.10.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/SourceID_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -27,8 +27,8 @@
 import java.io.IOException;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/StackMapTable_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.4.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/StackMap_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 import java.io.IOException;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Synthetic_attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  * See JVMS3, section 4.8.8.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/classfile/Type.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/classfile/Type.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,8 +34,8 @@
  *  Family of classes used to represent the parsed form of a {@link Descriptor}
  *  or {@link Signature}.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/Launcher.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/Launcher.java	Thu Jun 10 16:08:01 2010 -0700
@@ -41,7 +41,7 @@
  * of a <em>project</em>).  Simply ensure that this class is added to
  * the project and make it the main class of the project.</p>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/Server.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/Server.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,7 +36,7 @@
  * Java Compiler Server.  Can be used to speed up a set of (small)
  * compilation tasks by caching jar files between compilations.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/DiagnosticFormatter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -33,7 +33,7 @@
  * Provides simple functionalities for javac diagnostic formatting.
  * @param <D> type of diagnostic handled by this formatter
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/api/Formattable.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/Formattable.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,7 +31,7 @@
  * This interface must be implemented by any javac class that has non-trivial
  * formatting needs (e.g. where toString() does not apply because of localization).
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/api/JavacScope.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/JavacScope.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,7 +38,7 @@
 /**
  * Provides an implementation of Scope.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTaskImpl.java	Thu Jun 10 16:08:01 2010 -0700
@@ -56,7 +56,7 @@
 /**
  * Provides access to functionality specific to the Sun Java Compiler, javac.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
@@ -502,7 +502,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public Context getContext() {
@@ -510,7 +510,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public void updateContext(Context newContext) {
@@ -518,7 +518,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public Type parseType(String expr, TypeElement scope) {
--- a/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTool.java	Thu Jun 10 16:08:01 2010 -0700
@@ -57,7 +57,7 @@
 /**
  * TODO: describe com.sun.tools.javac.api.Tool
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/JavacTrees.java	Thu Jun 10 16:08:01 2010 -0700
@@ -71,7 +71,7 @@
 /**
  * Provides an implementation of Trees.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/api/Messages.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/Messages.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,7 +32,7 @@
  * This interface defines the minimum requirements in order to provide support
  * for localized formatted strings.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/api/WrappingJavaFileManager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -42,7 +42,7 @@
  * <p>This class might be moved to {@link javax.tools} in a future
  * release.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/code/Attribute.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Attribute.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,8 +38,8 @@
 
 /** An annotation value.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/BoundKind.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/BoundKind.java	Thu Jun 10 16:08:01 2010 -0700
@@ -27,7 +27,7 @@
 
 /**
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Flags.java	Thu Jun 10 16:08:01 2010 -0700
@@ -33,8 +33,8 @@
 
 /** Access flags and other modifiers for Java classes and members.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Kinds.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Kinds.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,8 +38,8 @@
  *  different subclasses of Symbol. Symbol kinds are organized so they can be
  *  or'ed to sets.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Lint.java	Thu Jun 10 16:08:01 2010 -0700
@@ -39,8 +39,8 @@
 /**
  * A class for handling -Xlint suboptions and @SuppresssWarnings.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Printer.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Printer.java	Thu Jun 10 16:08:01 2010 -0700
@@ -41,7 +41,7 @@
  * A combined type/symbol visitor for generating non-trivial localized string
  * representation of types and symbols.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/code/Scope.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Scope.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,8 +34,8 @@
  *  as hash tables. Scopes can be nested; the next field of a scope points
  *  to its next outer scope. Nested scopes can share their hash tables.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Source.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Source.java	Thu Jun 10 16:08:01 2010 -0700
@@ -33,8 +33,8 @@
 
 /** The source language version accepted.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Symbol.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Symbol.java	Thu Jun 10 16:08:01 2010 -0700
@@ -49,8 +49,8 @@
  *  types, packages. Each subclass is represented as a static inner class
  *  inside Symbol.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Symtab.java	Thu Jun 10 16:08:01 2010 -0700
@@ -42,8 +42,8 @@
  *  fields. This makes it possible to work in multiple concurrent
  *  projects, which might use different class files for library classes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/TargetType.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/TargetType.java	Thu Jun 10 16:08:01 2010 -0700
@@ -39,8 +39,8 @@
  * annotation targets a type argument in a local variable, method return type,
  * or a typecast).
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Type.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Type.java	Thu Jun 10 16:08:01 2010 -0700
@@ -56,8 +56,8 @@
  *  the error type (tag: ERROR, class: ErrorType).
  *  </pre>
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  *
--- a/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/TypeAnnotationPosition.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,8 +29,8 @@
 
 /** A type annotation position.
 *
-*  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
-*  you write code that depends on this, you do so at your own risk.
+*  <p><b>This is NOT part of any supported API.
+*  If you write code that depends on this, you do so at your own risk.
 *  This code and its internal interfaces are subject to change or
 *  deletion without notice.</b>
 */
--- a/src/share/classes/com/sun/tools/javac/code/TypeTags.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/TypeTags.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,8 +29,8 @@
 /** An interface for type tag values, which distinguish between different
  *  sorts of types.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/code/Types.java	Thu Jun 10 16:08:01 2010 -0700
@@ -58,7 +58,7 @@
  * <dd>A second list of types should be named ss.</dd>
  * </dl>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/comp/Annotate.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Annotate.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,8 +35,8 @@
  *  which is processed at the top level of any set of recursive calls
  *  requesting it be processed.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Attr.java	Thu Jun 10 16:08:01 2010 -0700
@@ -59,8 +59,8 @@
  *  @see ConstFold
  *  @see Infer
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/AttrContext.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 /** Contains information specific to the attribute and enter
  *  passes, to be used in place of the generic field in environments.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/AttrContextEnv.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 
 /** {@code Env<A>} specialized as {@code Env<AttrContext>}
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Check.java	Thu Jun 10 16:08:01 2010 -0700
@@ -47,8 +47,8 @@
 
 /** Type checking helper class for the attribution phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/ConstFold.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/ConstFold.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,8 +37,8 @@
 /** Helper class for constant folding, used by the attribution phase.
  *  This class is marked strictfp as mandated by JLS 15.4.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Enter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Enter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -82,8 +82,8 @@
  *                                              (only for toplevel classes)
  *  </pre>
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Env.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Env.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
  *  a generic component, represented as a type parameter, to carry further
  *  information specific to individual passes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Flow.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Flow.java	Thu Jun 10 16:08:01 2010 -0700
@@ -170,8 +170,8 @@
  *  allow unqualified forms only, parentheses optional, and phase out
  *  support for assigning to a final field via this.x.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Infer.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,8 +37,8 @@
 
 /** Helper class for type parameter inference, used by the attribution phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Lower.java	Thu Jun 10 16:08:01 2010 -0700
@@ -48,8 +48,8 @@
 /** This pass translates away some syntactic sugar: inner classes,
  *  class literals, assertions, foreach loops, etc.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/MemberEnter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -48,8 +48,8 @@
  *  by entering their members into the class scope using
  *  MemberEnter.complete().  See Enter for an overview.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Thu Jun 10 16:08:01 2010 -0700
@@ -47,8 +47,8 @@
 
 /** Helper class for name resolution, used mostly by the attribution phase.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/Todo.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/Todo.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
 
 /** A queue of all as yet unattributed classes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/comp/TransTypes.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,8 +43,8 @@
 
 /** This pass translates Generic Java to conventional Java.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/BaseFileObject.java	Thu Jun 10 16:08:01 2010 -0700
@@ -42,7 +42,7 @@
 import com.sun.tools.javac.util.BaseFileManager;
 
 /**
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/CacheFSInfo.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,7 +36,7 @@
 /**
  * Caching implementation of FSInfo.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/FSInfo.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/FSInfo.java	Thu Jun 10 16:08:01 2010 -0700
@@ -17,7 +17,7 @@
  * Get meta-info about files. Default direct (non-caching) implementation.
  * @see CacheFSInfo
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/JavacFileManager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -68,7 +68,7 @@
  * This class provides access to the source, class and other files
  * used by the compiler and related tools.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/Paths.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/Paths.java	Thu Jun 10 16:08:01 2010 -0700
@@ -54,8 +54,8 @@
  *  into a boot class path, user class path, and source path (in
  *  Collection<String> form).
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/RegularFileObject.java	Thu Jun 10 16:08:01 2010 -0700
@@ -44,7 +44,7 @@
 /**
  * A subclass of JavaFileObject representing regular files.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/RelativePath.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/RelativePath.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,7 +35,7 @@
  * container, such as a directory or zip file.
  * Internally, the file separator is always '/'.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/SymbolArchive.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,7 +36,7 @@
 import com.sun.tools.javac.util.List;
 
 /**
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/ZipArchive.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/ZipArchive.java	Thu Jun 10 16:08:01 2010 -0700
@@ -51,7 +51,7 @@
 import java.lang.ref.SoftReference;
 
 /**
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndex.java	Thu Jun 10 16:08:01 2010 -0700
@@ -69,7 +69,7 @@
  * checking to reindex the zip files if it is needed. In batch mode the timestamps are not checked
  * and the compiler uses the cached indexes.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/file/ZipFileIndexArchive.java	Thu Jun 10 16:08:01 2010 -0700
@@ -45,7 +45,7 @@
 import com.sun.tools.javac.util.List;
 
 /**
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/ByteCodes.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,8 +29,8 @@
 /** Bytecode instruction codes, as well as typecodes used as
  *  instruction modifiers.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/CRTFlags.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 
 /** The CharacterRangeTable flags indicating type of an entry.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/CRTable.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/CRTable.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
  *  and the hashtable for mapping trees or lists of trees to their
  *  ending positions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassFile.java	Thu Jun 10 16:08:01 2010 -0700
@@ -59,8 +59,8 @@
  *  as routines to convert between internal ``.'' and external ``/''
  *  separators in class names.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b> */
 public class ClassFile {
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Thu Jun 10 16:08:01 2010 -0700
@@ -62,8 +62,8 @@
  *  for all other definitions in the classfile. Top-level Classes themselves
  *  appear as members of the scopes of PackageSymbols.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/ClassWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -49,8 +49,8 @@
 /** This class provides operations to map an internal symbol table graph
  *  rooted in a ClassSymbol into a classfile.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Code.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/Code.java	Thu Jun 10 16:08:01 2010 -0700
@@ -39,8 +39,8 @@
  *  methods in a classfile. The class also provides some utility operations to
  *  generate bytecode instructions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java	Thu Jun 10 16:08:01 2010 -0700
@@ -49,8 +49,8 @@
 
 /** This pass maps flat Java (i.e. without inner classes) to bytecodes.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Items.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/Items.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,8 +43,8 @@
  *  special values this or super, etc. Individual items are represented as
  *  inner classes in class Items.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/Pool.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 
 /** An internal structure that corresponds to the constant pool of a classfile.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/Target.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/Target.java	Thu Jun 10 16:08:01 2010 -0700
@@ -33,8 +33,8 @@
 
 /** The classfile version target.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/jvm/UninitializedType.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 /** These pseudo-types appear in the generated verifier tables to
  *  indicate objects that have been allocated but not yet constructed.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/CommandLine.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/main/CommandLine.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,8 +35,8 @@
 /**
  * Various utility methods for processing Java tool command line arguments.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java	Thu Jun 10 16:08:01 2010 -0700
@@ -73,8 +73,8 @@
  *  construct a new compiler, and to run a new compiler on a set of source
  *  files.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/JavacOption.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/main/JavacOption.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,7 +34,7 @@
 /**
  * TODO: describe com.sun.tools.javac.main.JavacOption
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/main/Main.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/main/Main.java	Thu Jun 10 16:08:01 2010 -0700
@@ -47,8 +47,8 @@
 
 /** This class provides a commandline interface to the GJC compiler.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/main/OptionName.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/main/OptionName.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,7 +29,7 @@
 /**
  * TODO: describe com.sun.tools.javac.main.OptionName
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/main/RecognizedOptions.java	Thu Jun 10 16:08:01 2010 -0700
@@ -49,7 +49,7 @@
 /**
  * TODO: describe com.sun.tools.javac.main.RecognizedOptions
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/model/AnnotationProxyMaker.java	Thu Jun 10 16:08:01 2010 -0700
@@ -50,8 +50,8 @@
  * <p> The "dynamic proxy return form" of an annotation element value is
  * the form used by sun.reflect.annotation.AnnotationInvocationHandler.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- * you write code that depends on this, you do so at your own risk.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/model/FilteredMemberList.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,8 +38,8 @@
  * filtering out unwanted elements such as synthetic ones.
  * This view is most efficiently accessed through its iterator() method.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- * you write code that depends on this, you do so at your own risk.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/model/JavacElements.java	Thu Jun 10 16:08:01 2010 -0700
@@ -53,7 +53,7 @@
 /**
  * Utility methods for operating on program elements.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/model/JavacSourcePosition.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,7 +31,7 @@
 /**
  * Implementation of model API SourcePosition based on javac internal state.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/model/JavacTypes.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,7 +37,7 @@
 /**
  * Utility methods for operating on types.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/nio/JavacPathFileManager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -101,8 +101,8 @@
  *  <p>To reduce confusion with Path objects, the locations such as "class path",
  *  "source path", etc, are generically referred to here as "search paths".
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/nio/PathFileManager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -41,8 +41,8 @@
  *  getStandardFileManager}. However, would need to be handled carefully
  *  as another forward reference from langtools to jdk.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/nio/PathFileObject.java	Thu Jun 10 16:08:01 2010 -0700
@@ -56,8 +56,8 @@
  *  different factory methods, which compute the binary name based on
  *  information available at the time the file object is created.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/DocCommentScanner.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,8 +35,8 @@
  *  translating Unicode escape sequences and by stripping the
  *  leading whitespace and starts from each line of the comment.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/EndPosParser.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,7 +36,7 @@
  * This class is similar to Parser except that it stores ending
  * positions for the tree nodes.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/JavacParser.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,8 +43,8 @@
  *  operator precedence scheme is used for parsing binary operation
  *  expressions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/Keywords.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,7 +35,7 @@
 /**
  * Map from Name to Token and Token to String.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/parser/Lexer.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/Lexer.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,7 +32,7 @@
  * The lexical analyzer maps an input stream consisting of ASCII
  * characters and Unicode escapes into a token sequence.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/parser/Parser.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/Parser.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,7 +34,7 @@
  * Reads syntactic units from source code.
  * Parsers are normally created from a ParserFactory.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/ParserFactory.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,7 +35,7 @@
 /**
  * A factory for creating parsers.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/Scanner.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,8 +38,8 @@
 /** The lexical analyzer maps an input stream consisting of
  *  ASCII characters and Unicode escapes into a token sequence.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/parser/Token.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/parser/Token.java	Thu Jun 10 16:08:01 2010 -0700
@@ -33,8 +33,8 @@
 /** An interface that defines codes for Java source tokens
  *  returned from lexical analysis.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/processing/AnnotationProcessingError.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,7 +29,7 @@
 /**
  * Error thrown for problems encountered during annotation processing.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacFiler.java	Thu Jun 10 16:08:01 2010 -0700
@@ -87,7 +87,7 @@
  * class path can alter the behavior of the tool and any final
  * compile.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacMessager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,7 +37,7 @@
 /**
  * An implementation of the Messager built on top of log.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java	Thu Jun 10 16:08:01 2010 -0700
@@ -81,7 +81,7 @@
  * Objects of this class hold and manage the state needed to support
  * annotation processing.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
@@ -1380,7 +1380,7 @@
     }
 
     /**
-     * For internal use by Sun Microsystems only.  This method will be
+     * For internal use only.  This method will be
      * removed without warning.
      */
     public Context getContext() {
--- a/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/processing/JavacRoundEnvironment.java	Thu Jun 10 16:08:01 2010 -0700
@@ -40,7 +40,7 @@
  * <p>The methods in this class do not take type annotations into account,
  * as target types, not java elements.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/processing/PrintingProcessor.java	Thu Jun 10 16:08:01 2010 -0700
@@ -42,7 +42,7 @@
  * -Xprint option; the included visitor class is used to implement
  * Elements.printElements.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/processing/ServiceProxy.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,7 +37,7 @@
  * Utility class to determine if a service can be found on the
  * path that might be used to create a class loader.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/sym/CreateSymbols.java	Thu Jun 10 16:08:01 2010 -0700
@@ -77,7 +77,7 @@
  * <dd>Specifies the destination directory.</dd>
  * </dl>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/tree/JCTree.java	Thu Jun 10 16:08:01 2010 -0700
@@ -66,7 +66,7 @@
  * <p>To avoid ambiguities with the Tree API in com.sun.source all sub
  * classes should, by convention, start with JC (javac).
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/tree/Pretty.java	Thu Jun 10 16:08:01 2010 -0700
@@ -39,8 +39,8 @@
 
 /** Prints out a tree as an indented Java source program.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeCopier.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,8 +34,8 @@
  * Creates a copy of a tree, using a given TreeMaker.
  * Names, literal values, etc are shared with the original.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeInfo.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,8 +38,8 @@
 
 /** Utility class containing inspector methods for trees.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeMaker.java	Thu Jun 10 16:08:01 2010 -0700
@@ -39,8 +39,8 @@
 
 /** Factory class for trees.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeScanner.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
  *  do some interesting work. The scanner class itself takes care of all
  *  navigational aspects.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/tree/TreeTranslator.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,8 +37,8 @@
  *  do some interesting work. The translator class itself takes care of all
  *  navigational aspects.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Abort.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Abort.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 /** Throwing an instance of
  *  this class causes (silent) termination of the main compiler method.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/AbstractDiagnosticFormatter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -57,7 +57,7 @@
  *  <li> Provides the formatting logic for rendering the arguments of a JCDiagnostic object.
  * <ul>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/AbstractLog.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,8 +37,8 @@
  *  A base class for error logs. Reports errors and warnings, and
  *  keeps track of error numbers and positions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/BasicDiagnosticFormatter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -58,7 +58,7 @@
  * <li>%_: space delimiter, useful for formatting purposes
  * </ul>
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/util/Bits.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Bits.java	Thu Jun 10 16:08:01 2010 -0700
@@ -27,8 +27,8 @@
 
 /** A class for extensible, mutable bit sets.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/ByteBuffer.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
  *  appended. There are also methods to append names to byte buffers
  *  and to convert byte buffers to names.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/ClientCodeException.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,8 +29,8 @@
  * An exception used for propogating exceptions found in client code
  * invoked from javac.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/CloseableURLClassLoader.java	Thu Jun 10 16:08:01 2010 -0700
@@ -40,8 +40,8 @@
  * fragile. Caveat emptor.
  * @throws Error if the internal data structures are not as expected.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Constants.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Constants.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
 /**
  * Utilities for operating on constant values.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- * you write code that depends on this, you do so at your own risk.
+ * <p><b>This is NOT part of any supported API.
+ * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Context.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Context.java	Thu Jun 10 16:08:01 2010 -0700
@@ -91,8 +91,8 @@
  *     NewPhase.preRegister(context);
  * </pre>
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Convert.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Convert.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 /** Utility class for static conversion methods between numbers
  *  and strings in various formats.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/DiagnosticSource.java	Thu Jun 10 16:08:01 2010 -0700
@@ -40,8 +40,8 @@
  * A simple abstraction of a source file, as needed for use in a diagnostic message.
  * Provides access to the line and position in a line for any given character offset.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/FatalError.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/FatalError.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,8 +29,8 @@
  *  of the main compiler method.  It is used when some non-recoverable
  *  error has been detected in the compiler environment at runtime.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/ForwardingDiagnosticFormatter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,7 +38,7 @@
  * A delegated diagnostic formatter delegates all formatting
  * actions to an underlying formatter (aka the delegated formatter).
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java	Thu Jun 10 16:08:01 2010 -0700
@@ -38,8 +38,8 @@
 
 /** An abstraction of a diagnostic message generated by the compiler.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/JavacMessages.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/JavacMessages.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,8 +37,8 @@
 /**
  *  Support for formatted localized messages.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/LayoutCharacters.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,8 +28,8 @@
 /** An interface containing layout character constants used in Java
  *  programs.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/List.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/List.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,8 +43,8 @@
  *  <p>Lists are always trailed by a sentinel element, whose head and tail
  *  are both null.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/ListBuffer.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/ListBuffer.java	Thu Jun 10 16:08:01 2010 -0700
@@ -33,8 +33,8 @@
 /** A class for constructing lists by appending elements. Modelled after
  *  java.lang.StringBuffer.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Log.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Log.java	Thu Jun 10 16:08:01 2010 -0700
@@ -41,8 +41,8 @@
 /** A class for error logs. Reports errors and warnings, and
  *  keeps track of error numbers and positions.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/MandatoryWarningHandler.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,8 +43,8 @@
  * made on any API to generate a warning at all. In consequence, this handler only
  * gets to handle those warnings that JLS says must be generated.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Name.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Name.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,8 +29,8 @@
  *  Utf8 format. Names are stored in a Name.Table, and are unique within
  *  that table.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Names.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Names.java	Thu Jun 10 16:08:01 2010 -0700
@@ -29,8 +29,8 @@
  * Access to the compiler's name table.  STandard names are defined,
  * as well as methods to create new names.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Options.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Options.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
  *  If an option has an argument, the option name is mapped to the argument.
  *  If a set option has no argument, it is mapped to itself.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Pair.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Pair.java	Thu Jun 10 16:08:01 2010 -0700
@@ -27,8 +27,8 @@
 
 /** A generic class for pairs.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Position.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Position.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
  *  expansion is optional and no Unicode excape translation is considered.
  *  The first character is at location (1,1).
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/PropagatedException.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/PropagatedException.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,7 +28,7 @@
 /**
  * Used to propagate exceptions through to the user.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/RawDiagnosticFormatter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -41,7 +41,7 @@
  * or not the source name and position are set. This formatter provides a standardized, localize-independent
  * implementation of a diagnostic formatter; as such, this formatter is best suited for testing purposes.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/RichDiagnosticFormatter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -59,7 +59,7 @@
  * to two different type-variables with the same name, their representation is
  * disambiguated by appending an index to the type variable name.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/SharedNameTable.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
  * byte array, expanding it as needed. This avoids the overhead incurred
  * by using an array of bytes for each name.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/UnsharedNameTable.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,8 +32,8 @@
  * using weak references. It is recommended for use when a single shared
  * byte array is unsuitable.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javac/util/Warner.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javac/util/Warner.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,7 +31,7 @@
  * An interface to support optional warnings, needed for support of
  * unchecked conversions and unchecked casts.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own risk.
  * This code and its internal interfaces are subject to change or
  * deletion without notice.</b>
--- a/src/share/classes/com/sun/tools/javah/Gen.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/Gen.java	Thu Jun 10 16:08:01 2010 -0700
@@ -60,7 +60,7 @@
  * original writing, this interface is rich enough to support JNI and the
  * old 1.0-style native method interface.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javah/InternalError.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/InternalError.java	Thu Jun 10 16:08:01 2010 -0700
@@ -26,8 +26,8 @@
 package com.sun.tools.javah;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javah/JNI.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/JNI.java	Thu Jun 10 16:08:01 2010 -0700
@@ -42,7 +42,7 @@
 /**
  * Header file generator for JNI.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javah/JavahFileManager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/JavahFileManager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
 /**
  *  javah's implementation of JavaFileManager.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javah/JavahTask.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/JavahTask.java	Thu Jun 10 16:08:01 2010 -0700
@@ -76,7 +76,7 @@
  * Javah generates support files for native methods.
  * Parse commandline options & Invokes javadoc to execute those commands.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javah/JavahTool.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/JavahTool.java	Thu Jun 10 16:08:01 2010 -0700
@@ -40,7 +40,7 @@
 import javax.tools.StandardJavaFileManager;
 
 /*
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javah/LLNI.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/LLNI.java	Thu Jun 10 16:08:01 2010 -0700
@@ -48,7 +48,7 @@
 import javax.lang.model.util.SimpleTypeVisitor7;
 
 /*
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javah/Main.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/Main.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  *  Main entry point.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javah/Mangle.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/Mangle.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,7 +37,7 @@
  * this more fine grained and distribute the functionality to the
  * generators.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/NativeHeaderTool.java	Thu Jun 10 16:08:01 2010 -0700
@@ -44,8 +44,8 @@
  * @see JavaFileManager
  * @since 1.7
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javah/TypeSignature.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/TypeSignature.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,7 +43,7 @@
 /**
  * Returns internal type signature.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javah/Util.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javah/Util.java	Thu Jun 10 16:08:01 2010 -0700
@@ -44,7 +44,7 @@
  *      bug   -- Bug has occurred in javah
  *      fatal -- We can't even find resources, so bail fast, don't localize
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/src/share/classes/com/sun/tools/javap/AnnotationWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/AnnotationWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -40,8 +40,8 @@
 /**
  *  A writer for writing annotations as text.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/AttributeWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/AttributeWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -64,8 +64,8 @@
 /*
  *  A writer for writing Attributes as text.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/BasicWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/BasicWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -35,8 +35,8 @@
  *  A writer similar to a PrintWriter but which does not hide exceptions.
  *  The standard print calls are line-buffered; report calls write messages directly.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/ClassWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/ClassWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -54,8 +54,8 @@
 /*
  *  The main javap class to write the contents of a class file as text.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/CodeWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/CodeWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -40,8 +40,8 @@
 /*
  *  Write the contents of a Code attribute.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/ConstantWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/ConstantWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,8 +34,8 @@
 /*
  *  Write a constant pool entry.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/Context.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/Context.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 /*
  *  Class from which to put/get shared resources.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/DisassemblerTool.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/DisassemblerTool.java	Thu Jun 10 16:08:01 2010 -0700
@@ -44,8 +44,8 @@
  * @see JavaFileManager
  * @since 1.7
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/InstructionDetailWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -31,8 +31,8 @@
 /*
  *  Write additional details for an instruction.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/InternalError.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/InternalError.java	Thu Jun 10 16:08:01 2010 -0700
@@ -26,8 +26,8 @@
 package com.sun.tools.javap;
 
 /**
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/JavapFileManager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/JavapFileManager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -36,8 +36,8 @@
 /**
  *  javap's implementation of JavaFileManager.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/JavapTask.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/JavapTask.java	Thu Jun 10 16:08:01 2010 -0700
@@ -69,8 +69,8 @@
  *  "Main" class for javap, normally accessed from the command line
  *  via Main, or from JSR199 via DisassemblerTool.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/LocalVariableTableWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -42,8 +42,8 @@
 /**
  * Annotate instructions with details about local variables.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/LocalVariableTypeTableWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,8 +43,8 @@
 /**
  * Annotate instructions with details about local variables.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/Main.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/Main.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  *  Main entry point.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/Messages.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/Messages.java	Thu Jun 10 16:08:01 2010 -0700
@@ -30,8 +30,8 @@
 /**
  *  Access to javap messages.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/Options.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/Options.java	Thu Jun 10 16:08:01 2010 -0700
@@ -34,8 +34,8 @@
 /*
  *  Provides access to javap's options, set via the command line
  *  or JSR 199 API.
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/SourceWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/SourceWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -52,8 +52,8 @@
 /**
  * Annotate instructions with source code.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/StackMapWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/StackMapWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -45,8 +45,8 @@
 /**
  * Annotate instructions with stack map.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/TryBlockWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/TryBlockWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -37,8 +37,8 @@
 /**
  * Annotate instructions with details about try blocks.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java	Thu Jun 10 16:08:01 2010 -0700
@@ -41,8 +41,8 @@
 /**
  * Annotate instructions with details about type annotations.
  *
- *  <p><b>This is NOT part of any API supported by Sun Microsystems.  If
- *  you write code that depends on this, you do so at your own risk.
+ *  <p><b>This is NOT part of any supported API.
+ *  If you write code that depends on this, you do so at your own risk.
  *  This code and its internal interfaces are subject to change or
  *  deletion without notice.</b>
  */
--- a/src/share/classes/javax/lang/model/overview.html	Thu Jun 10 09:29:23 2010 +0100
+++ b/src/share/classes/javax/lang/model/overview.html	Thu Jun 10 16:08:01 2010 -0700
@@ -21,9 +21,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.
 -->
 
 </head>
--- a/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/apt/mirror/declaration/pkg1/pkg2/package.html	Thu Jun 10 16:08:01 2010 -0700
@@ -21,10 +21,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.
 -->
 
 </head>
--- a/test/tools/javac/6948381/T6948381.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/6948381/T6948381.java	Thu Jun 10 16:08:01 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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
@@ -16,9 +16,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/test/tools/javac/6948381/npe/A.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/6948381/npe/A.java	Thu Jun 10 16:08:01 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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
@@ -16,9 +16,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 npe;
--- a/test/tools/javac/6948381/npe/B.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/6948381/npe/B.java	Thu Jun 10 16:08:01 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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
@@ -16,9 +16,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 npe;
--- a/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/api/evalexpr/ByteArrayClassLoader.java	Thu Jun 10 16:08:01 2010 -0700
@@ -28,7 +28,7 @@
 /**
  * A class loader which loads classes from byte arrays.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/test/tools/javac/api/evalexpr/CompileFromString.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/api/evalexpr/CompileFromString.java	Thu Jun 10 16:08:01 2010 -0700
@@ -32,7 +32,7 @@
 /**
  * JSR 199 Demo application: compile from a String.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/test/tools/javac/api/evalexpr/MemoryFileManager.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/api/evalexpr/MemoryFileManager.java	Thu Jun 10 16:08:01 2010 -0700
@@ -43,7 +43,7 @@
  * This file manager delegates to another file manager
  * to lookup classes on boot class path.
  *
- * <p><b>This is NOT part of any API supported by Sun Microsystems.
+ * <p><b>This is NOT part of any supported API.
  * If you write code that depends on this, you do so at your own
  * risk.  This code and its internal interfaces are subject to change
  * or deletion without notice.</b></p>
--- a/test/tools/javac/generics/diamond/T6951833.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/generics/diamond/T6951833.java	Thu Jun 10 16:08:01 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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
@@ -16,9 +16,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/test/tools/javac/generics/typevars/T6880344.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/generics/typevars/T6880344.java	Thu Jun 10 16:08:01 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 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
@@ -16,9 +16,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/test/tools/javac/varargs/warning/Warn4.java	Thu Jun 10 09:29:23 2010 +0100
+++ b/test/tools/javac/varargs/warning/Warn4.java	Thu Jun 10 16:08:01 2010 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Sun Microsystems, Inc.  All Rights Reserved.
+ * Copyright (c) 2010, 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
@@ -16,9 +16,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.
  */
 
 /**