Merge -r 588599:588600 and 589547:589548 from trunk to branch-0.15 to fix HADOOP-2103.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/branches/branch-0.15@589551 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -333,6 +333,9 @@ Branch 0.15 (unreleased changes)
     to the superceding ToolRunner to ensure it picks up the appropriate
     configuration resources. (Dennis Kubes and Enis Soztutar via acmurthy) 
  
+    HADOOP-2103.  Fix minor javadoc bugs introduce by HADOOP-2046. (Nigel
+    Daley via acmurthy) 
+
   IMPROVEMENTS
 
     HADOOP-1908. Restructure data node code so that block sending and 

src/java/org/apache/hadoop/conf/Configuration.java

@@ -220,7 +220,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
    * Add a configuration resource. 
    * 
    * The properties of this resource will override properties of previously 
-   * added resources, unless they were marked <a href="#Final>final</a>. 
+   * added resources, unless they were marked <a href="#Final">final</a>. 
    * 
    * @param name resource to be added, the classpath is examined for a file 
    *             with that name.
@@ -233,7 +233,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
    * Add a configuration resource. 
    * 
    * The properties of this resource will override properties of previously 
-   * added resources, unless they were marked <a href="#Final>final</a>. 
+   * added resources, unless they were marked <a href="#Final">final</a>. 
    * 
    * @param url url of the resource to be added, the local filesystem is 
    *            examined directly to find the resource, without referring to 
@@ -247,7 +247,7 @@ public class Configuration implements Iterable<Map.Entry<String,String>> {
    * Add a configuration resource. 
    * 
    * The properties of this resource will override properties of previously 
-   * added resources, unless they were marked <a href="#Final>final</a>. 
+   * added resources, unless they were marked <a href="#Final">final</a>. 
    * 
    * @param file file-path of resource to be added, the local filesystem is
    *             examined directly to find the resource, without referring to 

src/java/org/apache/hadoop/io/WritableComparable.java

@@ -46,7 +46,7 @@ package org.apache.hadoop.io;
  *       public int compareTo(MyWritableComparable w) {
  *         int thisValue = this.value;
  *         int thatValue = ((IntWritable)o).value;
- *         return (thisValue<thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
+ *         return (thisValue &lt; thatValue ? -1 : (thisValue==thatValue ? 0 : 1));
  *       }
  *     }
  * </pre></blockquote></p>

src/java/org/apache/hadoop/mapred/Mapper.java

@@ -117,6 +117,7 @@ import org.apache.hadoop.io.compress.CompressionCodec;
  *         output.collect(key, val);
  *       }
  *     }
+ * </pre></blockquote></p>
  *
  * <p>Applications may write a custom {@link MapRunnable} to exert greater
  * control on map processing e.g. multi-threaded <code>Mapper</code>s etc.</p>