--- jsr166/src/jsr166e/StampedLock.java	2012/10/13 11:51:12	1.8
+++ jsr166/src/jsr166e/StampedLock.java	2012/10/13 23:05:13	1.12
@@ -11,8 +11,8 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * A capability-based lock with three modes for controlling read/write
- * access.  The state of a StampedLock consists of a version and
- * mode. Lock acquisition methods return a stamp that represents and
+ * access.  The state of a StampedLock consists of a version and mode.
+ * Lock acquisition methods return a stamp that represents and
  * controls access with respect to a lock state; "try" versions of
  * these methods may instead return the special value zero to
  * represent failure to acquire access. Lock release and conversion
@@ -55,7 +55,7 @@ import java.util.concurrent.TimeUnit;
  * <p>This class also supports methods that conditionally provide
  * conversions across the three modes. For example, method {@link
  * #tryConvertToWriteLock} attempts to "upgrade" a mode, returning
- * valid write stamp if (1) already in writing mode (2) in reading
+ * a valid write stamp if (1) already in writing mode (2) in reading
  * mode and there are no other readers or (3) in optimistic mode and
  * the lock is available. The forms of these methods are designed to
  * help reduce some of the code bloat that otherwise occurs in
@@ -539,7 +539,7 @@ public class StampedLock implements java
     }
 
     /**
-     * If the lock state matches the given stamp, releases
+     * If the lock state matches the given stamp, releases the
      * non-exclusive lock.
      *
      * @param stamp a stamp returned by a read-lock operation
@@ -606,10 +606,11 @@ public class StampedLock implements java
     /**
      * If the lock state matches the given stamp then performs one of
      * the following actions. If the stamp represents holding a write
-     * lock, returns it. Or, if a read lock, if the write lock is
-     * available, releases the read and returns a write stamp. Or, if
-     * an optimistic read, returns a write stamp only if immediately
-     * available. This method returns zero in all other cases.
+     * lock, returns it.  Or, if a read lock, if the write lock is
+     * available, releases the read lock and returns a write stamp.
+     * Or, if an optimistic read, returns a write stamp only if
+     * immediately available. This method returns zero in all other
+     * cases.
      *
      * @param stamp a stamp
      * @return a valid write stamp, or zero on failure