Merged r1230708 from trunk for MAPREDUCE-3664.

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

hadoop-mapreduce-project/CHANGES.txt

@@ -436,6 +436,9 @@ Release 0.23.1 - Unreleased
     MAPREDUCE-3404. Corrected MR AM to honor speculative configuration and enable
     speculating either maps or reduces. (Eric Payne via vinodkv)
 
+    MAPREDUCE-3664. Federation Documentation has incorrect configuration example.
+    (Brandon Li via jitendra)
+
 Release 0.23.0 - 2011-11-01 
 
   INCOMPATIBLE CHANGES

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

@@ -169,7 +169,7 @@ HDFS Federation
   </property>
   <property>
     <name>dfs.namenode.rpc-address.ns1</name>
-    <value>hdfs://nn-host1:rpc-port</value>
+    <value>nn-host1:rpc-port</value>
   </property>
   <property>
     <name>dfs.namenode.http-address.ns1</name>
@@ -181,7 +181,7 @@ HDFS Federation
   </property>
   <property>
     <name>dfs.namenode.rpc-address.ns2</name>
-    <value>hdfs://nn-host2:rpc-port</value>
+    <value>nn-host2:rpc-port</value>
   </property>
   <property>
     <name>dfs.namenode.http-address.ns2</name>