--- jsr166/src/jsr166y/Phaser.java	2009/08/08 19:36:52	1.27
+++ jsr166/src/jsr166y/Phaser.java	2009/08/19 15:23:18	1.30
@@ -535,9 +535,9 @@ public class Phaser {
 
     /**
      * Awaits the phase of the barrier to advance from the given phase
-     * value, or returns immediately if current phase of the barrier
-     * is not equal to the given phase value or this barrier is
-     * terminated.
+     * value, returning immediately if the current phase of the
+     * barrier is not equal to the given phase value or this barrier
+     * is terminated.
      *
      * @param phase the phase on entry to this method
      * @return the phase on exit from this method
@@ -556,10 +556,11 @@ public class Phaser {
     }
 
     /**
-     * Awaits the phase of the barrier to advance from the given
-     * value, or returns immediately if argument is negative or this
-     * barrier is terminated, or throws InterruptedException if
-     * interrupted while waiting.
+     * Awaits the phase of the barrier to advance from the given phase
+     * value, throwing InterruptedException if interrupted while
+     * waiting, or returning immediately if the current phase of the
+     * barrier is not equal to the given phase value or this barrier
+     * is terminated
      *
      * @param phase the phase on entry to this method
      * @return the phase on exit from this method
@@ -579,9 +580,11 @@ public class Phaser {
     }
 
     /**
-     * Awaits the phase of the barrier to advance from the given value
-     * or the given timeout elapses, or returns immediately if
-     * argument is negative or this barrier is terminated.
+     * Awaits the phase of the barrier to advance from the given phase
+     * value or the given timeout elapses, throwing
+     * InterruptedException if interrupted while waiting, or returning
+     * immediately if the current phase of the barrier is not equal to
+     * the given phase value or this barrier is terminated.
      *
      * @param phase the phase on entry to this method
      * @return the phase on exit from this method
@@ -713,7 +716,7 @@ public class Phaser {
      * only sensible to do so in designs where all parties register
      * before any arrive, and all {@link #awaitAdvance} at each phase.
      * Otherwise, you cannot ensure lack of interference from other
-     * parties during the the invocation of this method.
+     * parties during the invocation of this method.
      *
      * @param phase the phase number on entering the barrier
      * @param registeredParties the current number of registered parties