svn commit: r1102147 - in /hadoop/mapreduce/branches/branch-0.22: CHANGES.txt src/docs/src/documentation/content/xdocs/mapred_tutorial.xml

[todd]

Author: todd
Date: Thu May 12 00:33:26 2011
New Revision: 1102147

URL: http://svn.apache.org/viewvc?rev=1102147&view=rev
Log:
MAPREDUCE-869. Documentation for config to set map/reduce task environment. 
Contributed by Alejandro Abdelnur.

Modified:
    hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
    
hadoop/mapreduce/branches/branch-0.22/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml

Modified: hadoop/mapreduce/branches/branch-0.22/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/CHANGES.txt?rev=1102147&r1=1102146&r2=1102147&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.22/CHANGES.txt (original)
+++ hadoop/mapreduce/branches/branch-0.22/CHANGES.txt Thu May 12 00:33:26 2011
@@ -191,6 +191,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2337. Remove dependence of public MapReduce API on classes in
     server package. (tomwhite)
 
+    MAPREDUCE-869. Documentation for config to set map/reduce task environment
+    (Alejandro Abdelnur via todd)
+
   OPTIMIZATIONS
     
     MAPREDUCE-1354. Enhancements to JobTracker for better performance and

Modified: 
hadoop/mapreduce/branches/branch-0.22/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL: 
http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.22/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=1102147&r1=1102146&r2=1102147&view=diff
==============================================================================
--- 
hadoop/mapreduce/branches/branch-0.22/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
 (original)
+++ 
hadoop/mapreduce/branches/branch-0.22/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
 Thu May 12 00:33:26 2011
@@ -1156,13 +1156,13 @@
         
         <p>The child-task inherits the environment of the parent 
         <code>TaskTracker</code>. The user can specify additional options to 
the
-        child-jvm via the <code>mapred.{map|reduce}.child.java.opts</code> 
+        child-jvm via the <code>mapreduce.{map|reduce}.java.opts</code>
         configuration parameter in the job configuration such as non-standard 
          paths for the run-time linker to search shared libraries via 
         <code>-Djava.library.path=&lt;&gt;</code> etc. If the 
-        <code>mapred.{map|reduce}.child.java.opts</code> parameters contains 
the 
+        <code>mapreduce.{map|reduce}.java.opts</code> parameters contains the
         symbol <em>@taskid@</em> it is interpolated with value of 
-        <code>taskid</code> of the MapReduce task.</p>
+        <code>taskid</code> of the Map or Reduce task.</p>
         
         <p>Here is an example with multiple arguments and substitutions, 
         showing jvm GC logging, and start of a passwordless JVM JMX agent so 
that
@@ -1200,6 +1200,10 @@
           <code>&lt;/property&gt;</code>
         </p>
         
+        <p>In addition the <code>mapreduce.{map|reduce}.env</code> properties 
can be used
+        to add environment variables to the Map or Reduce child process.
+        </p>
+
         <section>
          <title>Configuring Memory Requirements For A Job</title>