--- jsr166/src/jsr166x/ConcurrentSkipListMap.java	2013/01/22 20:08:33	1.25
+++ jsr166/src/jsr166x/ConcurrentSkipListMap.java	2015/09/03 22:54:46	1.35
@@ -212,7 +212,7 @@ public class ConcurrentSkipListMap<K,V>
      * highly contended cases.
      *
      * Unlike most skip-list implementations, index insertion and
-     * deletion here require a separate traversal pass occuring after
+     * deletion here require a separate traversal pass occurring after
      * the base-level action, to add or remove index nodes.  This adds
      * to single-threaded overhead, but improves contended
      * multithreaded performance by narrowing interference windows,
@@ -419,7 +419,7 @@ public class ConcurrentSkipListMap<K,V>
          * because callers will have already read value field and need
          * to use that read (not another done here) and so directly
          * test if value points to node.
-         * @param n a possibly null reference to a node
+         *
          * @return true if this node is a marker node
          */
         boolean isMarker() {
@@ -468,7 +468,7 @@ public class ConcurrentSkipListMap<K,V>
          * Returns value if this node contains a valid key-value pair,
          * else null.
          * @return this node's value if it isn't a marker or header or
-         * is deleted, else null.
+         * is deleted, else null
          */
         V getValidValue() {
             Object v = value;
@@ -507,7 +507,7 @@ public class ConcurrentSkipListMap<K,V>
         volatile Index<K,V> right;
 
         /**
-         * Creates index node with given values
+         * Creates index node with given values.
          */
         Index(Node<K,V> node, Index<K,V> down, Index<K,V> right) {
             this.node = node;
@@ -766,7 +766,7 @@ public class ConcurrentSkipListMap<K,V>
     }
 
     /**
-     * Returns node holding key or null if no such, clearing out any
+     * Returns node holding key, or null if no such, clearing out any
      * deleted nodes seen along the way.  Repeatedly traverses at
      * base-level looking for key starting at predecessor returned
      * from findPredecessor, processing base-level deletions as
@@ -917,7 +917,7 @@ public class ConcurrentSkipListMap<K,V>
      * Main insertion method.  Adds element if not present, or
      * replaces value if present and onlyIfAbsent is false.
      * @param kkey the key
-     * @param value  the value that must be associated with key
+     * @param value the value that must be associated with key
      * @param onlyIfAbsent if should not insert if already present
      * @return the old value, or null if newly inserted
      */
@@ -1270,7 +1270,7 @@ public class ConcurrentSkipListMap<K,V>
         }
     }
 
-   /**
+    /**
      * Removes first entry; return key or null if empty.
      */
     K pollFirstKey() {
@@ -1601,9 +1601,9 @@ public class ConcurrentSkipListMap<K,V>
      * Constructs a new map containing the same mappings as the given
      * {@code SortedMap}, sorted according to the same ordering.
      * @param m the sorted map whose mappings are to be placed in this
-     * map, and whose comparator is to be used to sort this map.
+     * map, and whose comparator is to be used to sort this map
      * @throws NullPointerException if the specified sorted map is
-     * {@code null}.
+     * {@code null}
      */
     public ConcurrentSkipListMap(SortedMap<K, ? extends V> m) {
         this.comparator = m.comparator();
@@ -1728,7 +1728,7 @@ public class ConcurrentSkipListMap<K,V>
          * distinct because readObject calls can't be nicely adapted
          * as the kind of iterator needed by buildFromSorted. (They
          * can be, but doing so requires type cheats and/or creation
-         * of adaptor classes.) It is simpler to just adapt the code.
+         * of adapter classes.) It is simpler to just adapt the code.
          */
 
         HeadIndex<K,V> h = head;
@@ -2212,7 +2212,7 @@ public class ConcurrentSkipListMap<K,V>
      * if this map uses its keys' natural order.
      *
      * @return the comparator associated with this map, or
-     * {@code null} if it uses its keys' natural sort method.
+     * {@code null} if it uses its keys' natural sort method
      */
     public Comparator<? super K> comparator() {
         return comparator;
@@ -2842,7 +2842,7 @@ public class ConcurrentSkipListMap<K,V>
     }
 
     final class DescendingEntryIterator extends EntryIter
-        implements Iterator<Map.Entry<K,V>>  {
+        implements Iterator<Map.Entry<K,V>> {
         DescendingEntryIterator() {
             initDescending();
         }
@@ -2854,7 +2854,7 @@ public class ConcurrentSkipListMap<K,V>
     }
 
     final class DescendingSubMapEntryIterator extends EntryIter
-        implements Iterator<Map.Entry<K,V>>  {
+        implements Iterator<Map.Entry<K,V>> {
         final K least;
         DescendingSubMapEntryIterator(K least, K fence) {
             initDescending(least, fence);
@@ -3049,7 +3049,7 @@ public class ConcurrentSkipListMap<K,V>
         /**
          * Creates a new submap.
          * @param least inclusive least value, or {@code null} if from start
-         * @param fence exclusive upper bound or {@code null} if to end
+         * @param fence exclusive upper bound, or {@code null} if to end
          * @throws IllegalArgumentException if least and fence non-null
          *  and least greater than fence
          */
@@ -3104,7 +3104,7 @@ public class ConcurrentSkipListMap<K,V>
 
         /**
          * Returns least key. Needed by ConcurrentSkipListSet.
-         * @return least key or {@code null} if from start
+         * @return least key, or {@code null} if from start
          */
         K getLeast() {
             return least;
@@ -3112,7 +3112,7 @@ public class ConcurrentSkipListMap<K,V>
 
         /**
          * Returns fence key. Needed by ConcurrentSkipListSet.
-         * @return fence key or {@code null} of to end
+         * @return fence key, or {@code null} if to end
          */
         K getFence() {
             return fence;