Merge -r 1208767:1208768 from trunk to branch. FIXES: MAPREDUCE-3477

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1208770 13f79535-47bb-0310-9956-ffa450edef68

hadoop-mapreduce-project/CHANGES.txt

@@ -154,6 +154,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3450. NM port info no longer available in JobHistory.
     (Siddharth Seth via mahadev)
 
+    MAPREDUCE-3477. Hadoop site documentation cannot be built anymore. 
+    (jeagles via tucu)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-yarn/hadoop-yarn-site/src/site/apt/SingleCluster.apt.vm

@@ -145,7 +145,7 @@ Add the following configs to your <<<yarn-site.xml>>>
   </property>
 +---+
 
-** Setting up <<<capacity-scheduler.xml>>>
+* Setting up <<<capacity-scheduler.xml>>>
 
    Make sure you populate the root queues in <<<capacity-scheduler.xml>>>.