Merge
authorvaleriep
Tue, 16 Nov 2010 11:50:08 -0800
changeset 7270 0f1c7f1b54bf
parent 7269 b7fe0ebc290c (current diff)
parent 7267 1928ed40f8bd (diff)
child 7272 4ff2cc07e8c2
Merge
--- a/jdk/src/share/classes/java/lang/Readable.java	Mon Nov 15 14:38:41 2010 -0800
+++ b/jdk/src/share/classes/java/lang/Readable.java	Tue Nov 16 11:50:08 2010 -0800
@@ -44,11 +44,11 @@
      * rewinding of the buffer is performed.
      *
      * @param cb the buffer to read characters into
-     * @return @return The number of <tt>char</tt> values added to the buffer,
+     * @return The number of {@code char} values added to the buffer,
      *                 or -1 if this source of characters is at its end
      * @throws IOException if an I/O error occurs
      * @throws NullPointerException if cb is null
-     * @throws ReadOnlyBufferException if cb is a read only buffer
+     * @throws java.nio.ReadOnlyBufferException if cb is a read only buffer
      */
     public int read(java.nio.CharBuffer cb) throws IOException;