--- jsr166/src/main/java/util/Collection.java	2005/10/02 12:00:25	1.3
+++ jsr166/src/main/java/util/Collection.java	2008/05/18 23:47:55	1.8
@@ -1,8 +1,26 @@
 /*
- * %W% %E%
+ * Copyright 1997-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
- * SUN PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ * 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
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun 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
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
  */
 
 package java.util;
@@ -82,25 +100,25 @@ package java.util;
  * implementor deems it appropriate.
  *
  * <p>This interface is a member of the
- * <a href="{@docRoot}/../guide/collections/index.html">
+ * <a href="{@docRoot}/../technotes/guides/collections/index.html">
  * Java Collections Framework</a>.
  *
  * @author  Josh Bloch
  * @author  Neal Gafter
  * @version %I%, %G%
- * @see	    Set
- * @see	    List
- * @see	    Map
- * @see	    SortedSet
- * @see	    SortedMap
- * @see	    HashSet
- * @see	    TreeSet
- * @see	    ArrayList
- * @see	    LinkedList
- * @see	    Vector
+ * @see     Set
+ * @see     List
+ * @see     Map
+ * @see     SortedSet
+ * @see     SortedMap
+ * @see     HashSet
+ * @see     TreeSet
+ * @see     ArrayList
+ * @see     LinkedList
+ * @see     Vector
  * @see     Collections
- * @see	    Arrays
- * @see	    AbstractCollection
+ * @see     Arrays
+ * @see     AbstractCollection
  * @since 1.2
  */
 
@@ -260,7 +278,7 @@ public interface Collection<E> extends I
      * @param o element to be removed from this collection, if present
      * @return <tt>true</tt> if an element was removed as a result of this call
      * @throws ClassCastException if the type of the specified element
-     * 	       is incompatible with this collection (optional)
+     *         is incompatible with this collection (optional)
      * @throws NullPointerException if the specified element is null and this
      *         collection does not permit null elements (optional)
      * @throws UnsupportedOperationException if the <tt>remove</tt> operation
@@ -277,7 +295,7 @@ public interface Collection<E> extends I
      *
      * @param  c collection to be checked for containment in this collection
      * @return <tt>true</tt> if this collection contains all of the elements
-     *	       in the specified collection
+     *         in the specified collection
      * @throws ClassCastException if the types of one or more elements
      *         in the specified collection are incompatible with this
      *         collection (optional)