HADOOP-9607. Fixes in Javadoc build. Contributed by Timothy St. Clair

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1487979 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/CHANGES.txt

@@ -735,6 +735,8 @@ Release 2.0.5-beta - UNRELEASED
     HADOOP-9553. TestAuthenticationToken fails on Windows.
     (Arpit Agarwal via suresh)
 
+    HADOOP-9607. Fixes in Javadoc build (Timothy St. Clair via cos)
+
 Release 2.0.4-alpha - 2013-04-25 
 
   INCOMPATIBLE CHANGES

hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java

@@ -28,7 +28,7 @@ import org.apache.hadoop.metrics2.MetricsInfo;
  */
 @InterfaceAudience.Private
 public enum JvmMetricsInfo implements MetricsInfo {
-  JvmMetrics("JVM related metrics etc."), // record infoß
+  JvmMetrics("JVM related metrics etc."), // record info
   // metrics
   MemNonHeapUsedM("Non-heap memory used in MB"),
   MemNonHeapCommittedM("Non-heap memory committed in MB"),

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/main/java/org/apache/hadoop/yarn/webapp/example/MyApp.java

@@ -32,7 +32,7 @@ import org.apache.hadoop.yarn.webapp.view.HtmlPage;
 public class MyApp {
 
   // This is an app API
-  public String anyAPI() { return "anything ☁, really!"; }
+  public String anyAPI() { return "anything, really!"; }
 
   // Note this is static so it can be in any files.
   public static class MyController extends Controller {
@@ -46,7 +46,7 @@ public class MyApp {
 
     @Override
     public void index() {
-      set("anything", "something ☯");
+      set("anything", "something");
     }
 
     public void anythingYouWant() {