HADOOP-4836. Correct typos in mapred related documentation. (Jorda Polo via szetszwo)

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

CHANGES.txt

@@ -370,6 +370,9 @@ Release 0.19.1 - Unreleased
     HADOOP-4727. Fix a group checking bug in fill_stat_structure(...) in
     fuse-dfs.  (Brian Bockelman via szetszwo)
 
+    HADOOP-4836. Correct typos in mapred related documentation.  (Jordà Polo
+    via szetszwo)
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

docs/capacity_scheduler.html

@@ -264,7 +264,7 @@ document.write("Last Published: " + document.lastModified);
 <li>
           Queues are guaranteed a fraction of the capacity of the grid (their 
  	      'guaranteed capacity') in the sense that a certain capacity of 
- 	      resources will be at their disposal. All jobs submitted to the a 
+ 	      resources will be at their disposal. All jobs submitted to a 
  	      queue will have access to the capacity guaranteed to the queue.
         </li>
         

docs/changes.html

@@ -94,7 +94,7 @@ yhemanth)</li>
     </ol>
   </li>
   <li><a href="javascript:toggleList('trunk_(unreleased_changes)_._new_features_')">  NEW FEATURES
-</a>&nbsp;&nbsp;&nbsp;(5)
+</a>&nbsp;&nbsp;&nbsp;(6)
     <ol id="trunk_(unreleased_changes)_._new_features_">
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4575">HADOOP-4575</a>. Add a proxy service for relaying HsftpFileSystem requests.
 Includes client authentication via user certificates and config-based
@@ -115,11 +115,14 @@ problems.<br />(Suhas Gogate via omalley)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4029">HADOOP-4029</a>. Add NameNode storage information to the dfshealth page and
 move DataNode information to a separated page.<br />(Boris Shkolnik via
 szetszwo)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4348">HADOOP-4348</a>. Add service-level authorization for Hadoop.<br />(acmurthy)</li>
     </ol>
   </li>
   <li><a href="javascript:toggleList('trunk_(unreleased_changes)_._improvements_')">  IMPROVEMENTS
-</a>&nbsp;&nbsp;&nbsp;(42)
+</a>&nbsp;&nbsp;&nbsp;(44)
     <ol id="trunk_(unreleased_changes)_._improvements_">
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4749">HADOOP-4749</a>. Added a new counter REDUCE_INPUT_BYTES.<br />(Yongqiang He via
+zshao)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4234">HADOOP-4234</a>. Fix KFS "glue" layer to allow applications to interface
 with multiple KFS metaservers.<br />(Sriram Rao via lohit)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4245">HADOOP-4245</a>. Update to latest version of KFS "glue" library jar.<br />(Sriram Rao via lohit)</li>
@@ -199,6 +202,7 @@ Once in 24 hours, a TaskTracker blacklisted for all jobs is given a chance.
 Restarting the TaskTracker moves it out of the blacklist.<br />(Amareshwari Sriramadasu via ddas)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4688">HADOOP-4688</a>. Modify the MiniMRDFSSort unit test to spill multiple times,
 exercising the map-side merge code.<br />(cdouglas)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4737">HADOOP-4737</a>. Adds the KILLED notification when jobs get killed.<br />(Amareshwari Sriramadasu via ddas)</li>
     </ol>
   </li>
   <li><a href="javascript:toggleList('trunk_(unreleased_changes)_._optimizations_')">  OPTIMIZATIONS
@@ -209,7 +213,7 @@ based on the rack/host that has the most number of bytes.<br />(Jothi Padmanabha
     </ol>
   </li>
   <li><a href="javascript:toggleList('trunk_(unreleased_changes)_._bug_fixes_')">  BUG FIXES
-</a>&nbsp;&nbsp;&nbsp;(37)
+</a>&nbsp;&nbsp;&nbsp;(39)
     <ol id="trunk_(unreleased_changes)_._bug_fixes_">
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4204">HADOOP-4204</a>. Fix findbugs warnings related to unused variables, naive
 Number subclass instantiation, Map iteration, and badly scoped inner
@@ -277,6 +281,9 @@ Yang via cdouglas)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4708">HADOOP-4708</a>. Add binaries missed in the initial checkin for Chukwa.<br />(Eric
 Yang via cdouglas)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4805">HADOOP-4805</a>. Remove black list collector from Chukwa Agent HTTP Sender.<br />(Eric Yang via cdouglas)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4837">HADOOP-4837</a>. Move HADOOP_CONF_DIR configuration to chukwa-env.sh<br />(Jerome
+Boulon via cdouglas)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4825">HADOOP-4825</a>. Use ps instead of jps for querying process status in Chukwa.<br />(Eric Yang via cdouglas)</li>
     </ol>
   </li>
 </ul>
@@ -291,7 +298,7 @@ mapred tutorial.<br />(Vivek Ratan via cdouglas)</li>
     </ol>
   </li>
   <li><a href="javascript:toggleList('release_0.19.1_-_unreleased_._bug_fixes_')">  BUG FIXES
-</a>&nbsp;&nbsp;&nbsp;(5)
+</a>&nbsp;&nbsp;&nbsp;(6)
     <ol id="release_0.19.1_-_unreleased_._bug_fixes_">
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4697">HADOOP-4697</a>. Fix getBlockLocations in KosmosFileSystem to handle multiple
 blocks correctly.<br />(Sriram Rao via cdouglas)</li>
@@ -302,6 +309,8 @@ current workding directory for scratch space.<br />(Amar Kamat via cdouglas)</li
 szetszwo)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4727">HADOOP-4727</a>. Fix a group checking bug in fill_stat_structure(...) in
 fuse-dfs.<br />(Brian Bockelman via szetszwo)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4836">HADOOP-4836</a>. Correct typos in mapred related documentation.<br />(Jordà Polo
+via szetszwo)</li>
     </ol>
   </li>
 </ul>
@@ -945,7 +954,7 @@ restrictions on combiners.<br />(omalley)</li>
     </ol>
   </li>
   <li><a href="javascript:toggleList('release_0.18.3_-_unreleased_._bug_fixes_')">  BUG FIXES
-</a>&nbsp;&nbsp;&nbsp;(26)
+</a>&nbsp;&nbsp;&nbsp;(27)
     <ol id="release_0.18.3_-_unreleased_._bug_fixes_">
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4499">HADOOP-4499</a>. DFSClient should invoke checksumOk only once.<br />(Raghu Angadi)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4597">HADOOP-4597</a>. Calculate mis-replicated blocks when safe-mode is turned
@@ -988,6 +997,8 @@ map/reduce job failed to prompt temporary output.<br />(hairong)</li>
 receiver's tmp data directory.<br />(hairong)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4613">HADOOP-4613</a>. Fix block browsing on Web UI.<br />(Johan Oskarsson via shv)</li>
       <li><a href="http://issues.apache.org/jira/browse/HADOOP-4806">HADOOP-4806</a>. HDFS rename should not use src path as a regular expression.<br />(szetszwo)</li>
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4795">HADOOP-4795</a>. Prevent lease monitor getting into an infinite loop when
+leases and the namespace tree does not match.<br />(szetszwo)</li>
     </ol>
   </li>
 </ul>
@@ -1603,6 +1614,13 @@ cdouglas)</li>
 <h3><a href="javascript:toggleList('release_0.17.3_-_unreleased_')">Release 0.17.3 - Unreleased
 </a></h3>
 <ul id="release_0.17.3_-_unreleased_">
+  <li><a href="javascript:toggleList('release_0.17.3_-_unreleased_._improvements_')">  IMPROVEMENTS
+</a>&nbsp;&nbsp;&nbsp;(1)
+    <ol id="release_0.17.3_-_unreleased_._improvements_">
+      <li><a href="http://issues.apache.org/jira/browse/HADOOP-4164">HADOOP-4164</a>. Chinese translation of the documentation.<br />(Xuebing Yan via
+omalley)</li>
+    </ol>
+  </li>
   <li><a href="javascript:toggleList('release_0.17.3_-_unreleased_._bug_fixes_')">  BUG FIXES
 </a>&nbsp;&nbsp;&nbsp;(4)
     <ol id="release_0.17.3_-_unreleased_._bug_fixes_">

docs/hadoop-default.html

@@ -18,6 +18,9 @@
   ordering of the filters.</td>
 </tr>
 <tr>
+<td><a name="hadoop.security.authorization">hadoop.security.authorization</a></td><td>false</td><td>Is service-level authorization enabled?</td>
+</tr>
+<tr>
 <td><a name="hadoop.logfile.size">hadoop.logfile.size</a></td><td>10000000</td><td>The max size of each log file</td>
 </tr>
 <tr>

docs/mapred_tutorial.html

@@ -1857,7 +1857,7 @@ document.write("Last Published: " + document.lastModified);
         
 <li>
 <span class="codefrag">${mapred.local.dir}/taskTracker/jobcache/$jobid/$taskid</span>
-        : The task direcrory for each task attempt. Each task directory
+        : The task directory for each task attempt. Each task directory
         again has the following structure :
         <ul>
         

src/contrib/capacity-scheduler/src/java/org/apache/hadoop/mapred/CapacityTaskScheduler.java

@@ -79,7 +79,7 @@ class CapacityTaskScheduler extends TaskScheduler {
     // This time is equal to the time when the object was created, plus
     // the reclaim-time SLA for the queue.  
     public long whenToExpire;
-    // we also keep track of when to kill tasks, im millisecs. This is a 
+    // we also keep track of when to kill tasks, in millisecs. This is a 
     // fraction of 'whenToExpire', but we store it here so we don't 
     // recompute it every time. 
     public long whenToKill;
@@ -149,7 +149,7 @@ class CapacityTaskScheduler extends TaskScheduler {
      * created, it is placed in one queue. Once we kill tasks to recover 
      * resources for that object, it is placed in an expiry queue. we need
      * to do this to prevent creating spurious ResourceReclaim objects. We 
-     * keep a count of total resources that are being reclaimed. Thsi count 
+     * keep a count of total resources that are being reclaimed. This count 
      * is decremented when an object expires. 
      */
     
@@ -824,13 +824,13 @@ class CapacityTaskScheduler extends TaskScheduler {
        * update all our QSI objects.
        * This involves updating each qsi structure. This operation depends
        * on the number of running jobs in a queue, and some waiting jobs. If it
-       * becomes expensive, do it once every few hearbeats only.
+       * becomes expensive, do it once every few heartbeats only.
        */ 
       updateQSIObjects();
       LOG.debug("After updating QSI objects in " + this.type + " scheduler :");
       printQSIs();
       /*
-       * sort list of qeues first, as we want queues that need the most to
+       * sort list of queues first, as we want queues that need the most to
        * get first access. If this is expensive, sort every few heartbeats.
        * We're only sorting a collection of queues - there shouldn't be many.
        */

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

@@ -42,7 +42,7 @@
         <li>
           Queues are guaranteed a fraction of the capacity of the grid (their 
  	      'guaranteed capacity') in the sense that a certain capacity of 
- 	      resources will be at their disposal. All jobs submitted to the a 
+ 	      resources will be at their disposal. All jobs submitted to a 
  	      queue will have access to the capacity guaranteed to the queue.
         </li>
         <li>

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

@@ -1289,7 +1289,7 @@
         : The job.xml file, the generic job configuration, localized for 
         the job. </li>
         <li><code>${mapred.local.dir}/taskTracker/jobcache/$jobid/$taskid</code>
-        : The task direcrory for each task attempt. Each task directory
+        : The task directory for each task attempt. Each task directory
         again has the following structure :
         <ul>
         <li><code>${mapred.local.dir}/taskTracker/jobcache/$jobid/$taskid/job.xml</code>

src/mapred/org/apache/hadoop/mapred/jobcontrol/Job.java

@@ -33,12 +33,12 @@ import org.apache.hadoop.util.StringUtils;
 
 /** This class encapsulates a MapReduce job and its dependency. It monitors 
  *  the states of the depending jobs and updates the state of this job.
- *  A job stats in the WAITING state. If it does not have any deoending jobs, or
+ *  A job starts in the WAITING state. If it does not have any depending jobs, or
  *  all of the depending jobs are in SUCCESS state, then the job state will become
  *  READY. If any depending jobs fail, the job will fail too. 
  *  When in READY state, the job can be submitted to Hadoop for execution, with
  *  the state changing into RUNNING state. From RUNNING state, the job can get into 
- *  SUCCESS or FAILED state, depending the status of the jon execution.
+ *  SUCCESS or FAILED state, depending the status of the job execution.
  *  
  */