HADOOP-2215. Fix documentation in cluster_setup.html & mapred_tutorial.html reflect that mapred.tasktracker.tasks.maximum has been superceeded by mapred.tasktracker.{map|reduce}.tasks.maximum. Contributed by Amareshwari Sri Ramadasu.

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

CHANGES.txt

@@ -259,6 +259,11 @@ Trunk (unreleased changes)
     HADOOP-2459. Fix package target so that src/docs/build files are not
     included in the release.  (nigel)
 
+    HADOOP-2215.  Fix documentation in cluster_setup.html &
+    mapred_tutorial.html reflect that mapred.tasktracker.tasks.maximum has
+    been superceeded by mapred.tasktracker.{map|reduce}.tasks.maximum. 
+    (Amareshwari Sri Ramadasu via acmurthy)
+
 Branch 0.15 (unreleased)
 
   BUG FIXES

docs/cluster_setup.html

@@ -394,9 +394,9 @@ document.write("Last Published: " + document.lastModified);
 		    
 <tr>
 		      
-<td colspan="1" rowspan="1">mapred.tasktracker.tasks.maximum</td>
+<td colspan="1" rowspan="1">mapred.tasktracker.{map|reduce}.tasks.maximum</td>
 		      <td colspan="1" rowspan="1">
-		        The maximum number of map and reduce tasks, which are run 
+		        The maximum number of map/reduce tasks, which are run 
 		        simultaneously on a given <span class="codefrag">TaskTracker</span>, individually.
 		      </td>
 		      <td colspan="1" rowspan="1">

docs/mapred_tutorial.html

@@ -1331,7 +1331,7 @@ document.write("Last Published: " + document.lastModified);
 <h5>How Many Reduces?</h5>
 <p>The right number of reduces seems to be <span class="codefrag">0.95</span> or 
             <span class="codefrag">1.75</span> multiplied by (&lt;<em>no. of nodes</em>&gt; * 
-            <span class="codefrag">mapred.tasktracker.tasks.maximum</span>).</p>
+            <span class="codefrag">mapred.tasktracker.reduce.tasks.maximum</span>).</p>
 <p>With <span class="codefrag">0.95</span> all of the reduces can launch immediately 
             and start transfering map outputs as the maps finish. With 
             <span class="codefrag">1.75</span> the faster nodes will finish their first round of 

src/docs/src/documentation/content/xdocs/cluster_setup.xml

@@ -182,9 +182,9 @@
 		      <td>Multiple paths help spread disk i/o.</td>
 		    </tr>
 		    <tr>
-		      <td>mapred.tasktracker.tasks.maximum</td>
+		      <td>mapred.tasktracker.{map|reduce}.tasks.maximum</td>
 		      <td>
-		        The maximum number of map and reduce tasks, which are run 
+		        The maximum number of map/reduce tasks, which are run 
 		        simultaneously on a given <code>TaskTracker</code>, individually.
 		      </td>
 		      <td>

src/docs/src/documentation/content/xdocs/mapred_tutorial.xml

@@ -861,7 +861,7 @@
  
             <p>The right number of reduces seems to be <code>0.95</code> or 
             <code>1.75</code> multiplied by (&lt;<em>no. of nodes</em>&gt; * 
-            <code>mapred.tasktracker.tasks.maximum</code>).</p>
+            <code>mapred.tasktracker.reduce.tasks.maximum</code>).</p>
  
             <p>With <code>0.95</code> all of the reduces can launch immediately 
             and start transfering map outputs as the maps finish. With