From ad36a0e6a08af3ac6f516f9410db5d65de3a9a69 Mon Sep 17 00:00:00 2001
From: Eli Collins <eli@apache.org>
Date: Fri, 6 May 2011 04:29:53 +0000
Subject: [PATCH] HADOOP-7244. Documentation change for updated configuration
 keys. Contributed by Tom White

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1100048 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                            |  3 +++
 .../src/documentation/content/xdocs/cluster_setup.xml  | 10 +++++-----
 .../documentation/content/xdocs/single_node_setup.xml  |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 0ed450c0a8f..36d90a0969d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -401,6 +401,9 @@ Release 0.22.0 - Unreleased
     HADOOP-7241. fix typo of command 'hadoop fs -help tail'. 
     (Wei Yongjun via eli)
 
+    HADOOP-7244. Documentation change for updated configuration keys.
+    (tomwhite via eli)
+
   OPTIMIZATIONS
 
     HADOOP-6884. Add LOG.isDebugEnabled() guard for each LOG.debug(..).
diff --git a/src/docs/src/documentation/content/xdocs/cluster_setup.xml b/src/docs/src/documentation/content/xdocs/cluster_setup.xml
index 8f51c38ab3c..4e06247f50a 100644
--- a/src/docs/src/documentation/content/xdocs/cluster_setup.xml
+++ b/src/docs/src/documentation/content/xdocs/cluster_setup.xml
@@ -175,7 +175,7 @@
 		      <th>Notes</th>
 		    </tr>
 		    <tr>
-              <td>fs.default.name</td>
+              <td>fs.defaultFS</td>
               <td>URI of <code>NameNode</code>.</td>
               <td><em>hdfs://hostname/</em></td>
             </tr>
@@ -190,7 +190,7 @@
           <th>Notes</th>
         </tr>
 		    <tr>
-		      <td>dfs.name.dir</td>
+		      <td>dfs.namenode.name.dir</td>
 		      <td>
 		        Path on the local filesystem where the <code>NameNode</code> 
 		        stores the namespace and transactions logs persistently.</td>
@@ -200,7 +200,7 @@
 		      </td>
 		    </tr>
 		    <tr>
-		      <td>dfs.data.dir</td>
+		      <td>dfs.datanode.data.dir</td>
 		      <td>
 		        Comma separated list of paths on the local filesystem of a 
 		        <code>DataNode</code> where it should store its blocks.
@@ -1298,9 +1298,9 @@
       ">resolve</a> in an administrator configured
       module. The API resolves the slave's DNS name (also IP address) to a 
       rack id. What module to use can be configured using the configuration
-      item <code>topology.node.switch.mapping.impl</code>. The default 
+      item <code>net.topology.node.switch.mapping.impl</code>. The default 
       implementation of the same runs a script/command configured using 
-      <code>topology.script.file.name</code>. If topology.script.file.name is
+      <code>net.topology.script.file.name</code>. If topology.script.file.name is
       not set, the rack id <code>/default-rack</code> is returned for any 
       passed IP address. The additional configuration in the Map/Reduce
       part is <code>mapred.cache.task.levels</code> which determines the number
diff --git a/src/docs/src/documentation/content/xdocs/single_node_setup.xml b/src/docs/src/documentation/content/xdocs/single_node_setup.xml
index 9cc0f7bd316..3f6a441e6e5 100644
--- a/src/docs/src/documentation/content/xdocs/single_node_setup.xml
+++ b/src/docs/src/documentation/content/xdocs/single_node_setup.xml
@@ -167,7 +167,7 @@
         <source>
 &lt;configuration&gt;
      &lt;property&gt;
-         &lt;name&gt;fs.default.name&lt;/name&gt;
+         &lt;name&gt;fs.defaultFS&lt;/name&gt;
          &lt;value&gt;hdfs://localhost:9000&lt;/value&gt;
      &lt;/property&gt;
 &lt;/configuration&gt;