--- jsr166/src/jsr166e/CompletableFuture.java	2013/02/06 08:43:48	1.12
+++ jsr166/src/jsr166e/CompletableFuture.java	2013/05/20 16:16:42	1.17
@@ -55,7 +55,7 @@ import java.util.concurrent.locks.LockSu
  * Executor} or by default the {@link ForkJoinPool#commonPool()}, of a
  * function or action that will result in the completion of a new
  * CompletableFuture. To simplify monitoring, debugging, and tracking,
- * all generated asynchronous tasks are instances of the tagging
+ * all generated asynchronous tasks are instances of the marker
  * interface {@link AsynchronousCompletionTask}.
  *
  * <p><em>jsr166e note: During transition, this class
@@ -380,7 +380,7 @@ public class CompletableFuture<T> implem
     /* ------------- Async tasks -------------- */
 
     /**
-     * A tagging interface identifying asynchronous tasks produced by
+     * A marker interface identifying asynchronous tasks produced by
      * {@code async} methods. This may be useful for monitoring,
      * debugging, and tracking asynchronous activities.
      */
@@ -1053,7 +1053,7 @@ public class CompletableFuture<T> implem
                 (r = a.result) != null &&
                 compareAndSet(0, 1)) {
                 if ((r instanceof AltResult) &&
-                    (ex = ((AltResult)r).ex) != null)  {
+                    (ex = ((AltResult)r).ex) != null) {
                     try {
                         t = fn.apply(ex);
                     } catch (Throwable rex) {
@@ -1788,7 +1788,6 @@ public class CompletableFuture<T> implem
      * @param executor the executor to use for asynchronous execution
      * @return the new CompletableFuture
      */
-
     public <U,V> CompletableFuture<V> thenCombineAsync(CompletableFuture<? extends U> other,
                                                        BiFun<? super T,? super U,? extends V> fn,
                                                        Executor executor) {
@@ -2527,7 +2526,7 @@ public class CompletableFuture<T> implem
         if (r != null && (d == null || d.compareAndSet(0, 1))) {
             T t = null; Throwable ex, dx = null;
             if (r instanceof AltResult) {
-                if ((ex = ((AltResult)r).ex) != null)  {
+                if ((ex = ((AltResult)r).ex) != null) {
                     try {
                         t = fn.apply(ex);
                     } catch (Throwable rex) {
@@ -2555,7 +2554,6 @@ public class CompletableFuture<T> implem
      *
      * @param fn the function to use to compute the value of the
      * returned CompletableFuture
-
      * @return the new CompletableFuture
      */
     public <U> CompletableFuture<U> handle(BiFun<? super T, Throwable, ? extends U> fn) {