--- jsr166/src/extra166y/CustomConcurrentHashMap.java	2010/10/22 05:49:04	1.15
+++ jsr166/src/extra166y/CustomConcurrentHashMap.java	2011/10/25 18:46:37	1.19
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 package extra166y;
@@ -236,7 +236,7 @@ public class CustomConcurrentHashMap<K,
          * simple. The most common usage is to construct a new object
          * serving as an initial mapped value.
          *
-         * @param key the (nonnull) key
+         * @param key the (non-null) key
          * @return a value, or null if none
          */
         V map(K key);
@@ -1069,7 +1069,7 @@ public class CustomConcurrentHashMap<K,
     /**
      * If the specified key is not already associated with a value,
      * computes its value using the given mappingFunction, and if
-     * nonnull, enters it into the map.  This is equivalent to
+     * non-null, enters it into the map.  This is equivalent to
      *
      * <pre>
      *   if (map.containsKey(key))
@@ -1551,8 +1551,8 @@ public class CustomConcurrentHashMap<K,
     }
 
     /**
-     * Save the state of the instance to a stream (i.e., serialize
-     * it).
+     * Saves the state of the instance to a stream (i.e., serializes it).
+     *
      * @param s the stream
      * @serialData
      * the key (Object) and value (Object)
@@ -1570,7 +1570,7 @@ public class CustomConcurrentHashMap<K,
     }
 
     /**
-     * Reconstitute the instance from a stream (i.e., deserialize it).
+     * Reconstitutes the instance from a stream (that is, deserializes it).
      * @param s the stream
      */
     private void readObject(java.io.ObjectInputStream s)